Changeset 5056:b31e60545552 in roaraudio for roard/driver_portaudio.c

Timestamp:

06/02/11 23:13:11 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support auto reconf bits=32->16 in case not supported (See: #48)

File:

• roard/driver_portaudio.c (modified) (4 diffs)

roard/driver_portaudio.c

@@ -35 +35 @@
  long flags = PABLIO_WRITE;
 #elif defined(ROAR_HAVE_PA19_VERSION_19)
+ PaStreamParameters params;
+#endif
  PaError err;
- PaStreamParameters params;
-#endif
+ int autoconfig = 0;
 
  if ( fh != -1 )
   return -1;
+
+ if ( sstream != NULL ) {
+  autoconfig = streams_get_flag(ROAR_STREAM(sstream)->id, ROAR_FLAG_AUTOCONF);
+ }
 
  switch (info->bits) {
@@ -56 +61 @@
       break;
      default:
-       return -1;
+       if ( autoconfig ) {
+        info->codec = ROAR_CODEC_DEFAULT;
+        fmt = paInt8;
+       } else {
+        return -1;
+       }
       break;
     }
    break;
   case 16:
-    if ( info->codec != ROAR_CODEC_DEFAULT )
-     return -1;
+    if ( info->codec != ROAR_CODEC_DEFAULT ) {
+     if ( autoconfig ) {
+      info->codec = ROAR_CODEC_DEFAULT;
+     } else {
+      return -1;
+     }
+    }
     fmt = paInt16;
    break;
 #ifdef paPackedInt24
   case 24:
-    if ( info->codec != ROAR_CODEC_DEFAULT )
+    if ( info->codec != ROAR_CODEC_DEFAULT ) {
+     if ( autoconfig ) {
+      info->codec = ROAR_CODEC_DEFAULT;
+     } else {
+      return -1;
+     }
+    }
+    fmt = paPackedInt24;
+   break;
+#endif
+  case 32:
+    if ( info->codec != ROAR_CODEC_DEFAULT ) {
+     if ( autoconfig ) {
+      info->codec = ROAR_CODEC_DEFAULT;
+     } else {
+      return -1;
+     }
+    }
+    fmt = paInt32;
+   break;
+  default:
+    if ( autoconfig ) {
+     info->codec = ROAR_CODEC_DEFAULT;
+     info->bits  = 16;
+     fmt = paInt16;
+    } else {
      return -1;
-    fmt = paPackedInt24;
-   break;
-#endif
-  case 32:
-    if ( info->codec != ROAR_CODEC_DEFAULT )
-     return -1;
-    fmt = paInt32;
-   break;
-  default:
-    return -1;
+    }
+   break;
  }
 
@@ -100 +132 @@
   case 2: flags |= PABLIO_STEREO; break;
   default:
-    roar_mm_free(self);
-    Pa_Terminate();
-    return -1;
- }
-
- if ( OpenAudioStream(&(self->ostream), info->rate, fmt, flags) != paNoError ) {
+    if ( autoconfig ) {
+     info->channels = 2;
+     flags |= PABLIO_STEREO;
+    } else {
+     roar_mm_free(self);
+     Pa_Terminate();
+     return -1;
+    }
+ }
+
+ err = OpenAudioStream(&(self->ostream), info->rate, fmt, flags);
+
+ if ( err != paNoError && autoconfig ) {
+  if ( (flags & PABLIO_MONO) == PABLIO_MONO ) {
+   flags -= PABLIO_MONO;
+   flags |= PABLIO_STEREO;
+   info->channels = 2;
+  }
+  fmt         = paInt16;
+  info->codec = ROAR_CODEC_DEFAULT;
+  info->bits  = 16;
+
+  err = OpenAudioStream(&(self->ostream), info->rate, fmt, flags);
+ }
+
+ if ( err != paNoError ) {
   roar_mm_free(self);
   Pa_Terminate();
@@ -133 +185 @@
                     );
 
+ if ( err != paNoError && autoconfig ) {
+  params.sampleFormat = paInt16;
+  params.channelCount = 2;
+  info->codec         = ROAR_CODEC_DEFAULT;
+  info->bits          = 16;
+  info->channels      = 2;
+
+  err = Pa_OpenStream(&(self->stream),
+                      NULL,
+                      &params,
+                      info->rate,
+                      128 /*FIXME:frames*/,
+                      paClipOff,
+                      NULL,
+                      NULL
+                     );
+ }
+
  if ( err != paNoError ) {
   ROAR_ERR("driver_portaudio_open(*): Could not open PortAudio device: \"%s\".", Pa_GetErrorText(err));