Changeset 5056:b31e60545552 in roaraudio for roard/driver_pulsesimple.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_pulsesimple.c (modified) (5 diffs)

roard/driver_pulsesimple.c

@@ -34 +34 @@
  pa_stream_direction_t dir = PA_STREAM_PLAYBACK;
  pa_sample_spec        ss;
+ int autoconfig = 0;
+ int needauto   = 0;
 
 //    pa_sample_format_t format;     /**< The sample format */
+
+ if ( fh != -1 )
+  return -1;
+
+ if ( sstream != NULL ) {
+  autoconfig = streams_get_flag(ROAR_STREAM(sstream)->id, ROAR_FLAG_AUTOCONF);
+ }
 
  switch (info->codec) {
@@ -50 +59 @@
       break;
      default:
-       return -1;
+       needauto = 1;
       break;
     }
@@ -60 +69 @@
       break;
      default:
-       return -1;
+       needauto = 1;
       break;
     }
@@ -70 +79 @@
      ss.format = PA_SAMPLE_U8;
     } else {
-     return -1;
+     needauto = 1;
     }
    break;
   default:
-    return -1;
+    needauto = 1;
    break;
+ }
+
+ if ( needauto ) {
+  if ( !autoconfig ) {
+   return -1;
+  }
+
+  info->bits = 16;
+  info->codec = ROAR_CODEC_DEFAULT;
+  ss.format = PA_SAMPLE_S16NE;
  }
 
@@ -85 +104 @@
 
  self->handle = pa_simple_new(device, "roard", dir, subdev, "RoarAudio Sound Server", &ss, NULL, NULL, &pulseerror);
+
+ if ( self->handle == NULL && autoconfig ) {
+  info->bits = 16;
+  info->codec = ROAR_CODEC_DEFAULT;
+  ss.format = PA_SAMPLE_S16NE;
+
+  self->handle = pa_simple_new(device, "roard", dir, subdev, "RoarAudio Sound Server", &ss, NULL, NULL, &pulseerror);
+ }
 
  if ( self->handle == NULL ) {