Changeset 1521:1ecaaea92527 in roaraudio

Timestamp:

04/11/09 23:50:55 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

do seting of framents on first write

File:

• roard/driver_oss.c (modified) (6 diffs)

roard/driver_oss.c

@@ -32 +32 @@
  int blocksize;
  struct roar_audio_info info;
+ int need_reopen;
+ int need_config;
 };
 
@@ -222 +224 @@
  }
 
+ // latency things:
+#ifdef SNDCTL_DSP_SETFRAGMENT
+
+ // defaults
+ if ( self->blocksize < 1 )
+  self->blocksize = 2048;
+ if ( self->blocks < 1 )
+  self->blocks    =    4;
+
+ tmp  = 11;
+
+ tmp |= self->blocks << 16;
+ if ( ioctl(fh, SNDCTL_DSP_SETFRAGMENT, &tmp) == -1 ) {
+  ROAR_WARN("driver_oss_ctl(*): Can not set fragment size, sorry :(");
+ }
+#endif
+
+ self->need_config = 0;
+
  return 0;
 }
@@ -253 +274 @@
  }
 
+ self->need_config = 1;
+
+/*
  if ( driver_oss_config_device(self) == -1 ) {
   ROAR_ERR("driver_oss_open(*): Can not configure audio device");
   er();
  }
+*/
 
  tmp32 = 4;
@@ -302 +327 @@
 
 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data) {
+ struct driver_oss * self = vio->inst;
  int d;
+
+ ROAR_WARN("driver_oss_ctl(vio=%p, cmd=%i, data=%p) = ?", vio, cmd, data);
 
  if ( vio == NULL )
@@ -322 +350 @@
   case ROAR_VIO_CTL_SET_DBLOCKS:
 #ifdef SNDCTL_DSP_SETFRAGMENT
-    d = (*(uint_least32_t *)data) << 16 | 11; // (*data) fragements of 2048 Bytes.
-    if ( ioctl(_get(vio,fh), SNDCTL_DSP_SETFRAGMENT, &d) == -1 ) {
-     ROAR_WARN("driver_oss_ctl(*): Can not set fragment size, sorry :(");
-    }
+    if ( !self->need_config ) {
+     ROAR_WARN("driver_oss_ctl(*): possible late ROAR_VIO_CTL_SET_DBLOCKS, setting anyway.");
+    }
+
+    self->blocks    = *(uint_least32_t *)data;
 #else
     return -1;
 #endif
    break;
+  case ROAR_VIO_CTL_SET_DBLKSIZE:
+#ifdef SNDCTL_DSP_SETFRAGMENT
+    if ( !self->need_config ) {
+     ROAR_WARN("driver_oss_ctl(*): possible late ROAR_VIO_CTL_SET_DBLKSIZE, setting anyway.");
+    }
+
+    self->blocksize = *(uint_least32_t *)data;
+#else
+    return -1;
+#endif
+   break;
   case ROAR_VIO_CTL_GET_DBLKSIZE:
-    *(uint_least32_t *)data = 2048;
+    if ( !self->blocksize )
+     return -1;
+
+    *(uint_least32_t *)data = self->blocksize;
     return 0;
    break;
@@ -342 +385 @@
 
 ssize_t driver_oss_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
+ if ( _get(vio,need_config) ) {
+  if ( driver_oss_config_device(vio->inst) == -1 ) {
+   return -1;
+  }
+ }
+
  return write(_get(vio,fh), buf, count);
 }