Changeset 5056:b31e60545552 in roaraudio for roard/driver_ao.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_ao.c (modified) (4 diffs)

roard/driver_ao.c

@@ -32 +32 @@
  if ( _driver_ao_usage_counter++ == 0 )
   ao_initialize();
+
+#ifdef ROAR_HAVE_AO_APPEND_GLOBAL_OPTION
+ ao_append_global_option("client_name", "roard");
+#endif
 }
 
@@ -44 +48 @@
  ao_sample_format     format;
  int driver;
+ int autoconfig = 0;
 
  ROAR_WARN("The libao driver is obsolete, use another!");
@@ -49 +54 @@
  if ( fh != -1 )
   return -1;
+
+ if ( sstream != NULL ) {
+  autoconfig = streams_get_flag(ROAR_STREAM(sstream)->id, ROAR_FLAG_AUTOCONF);
+ }
 
  driver_ao_init();
@@ -94 +103 @@
    break;
   default:
-   ROAR_ERR("Can not open audio device via libao: codec not supported. You may want to try -oO codec=pcm");
-   driver_ao_uninit();
-   return -1;
-  break;
+    if ( autoconfig ) {
+     format.byte_format = AO_FMT_NATIVE;
+     info->codec = ROAR_CODEC_DEFAULT;
+    } else {
+     ROAR_ERR("Can not open audio device via libao: codec not supported. You may want to try -oO codec=pcm");
+     driver_ao_uninit();
+     return -1;
+    }
+   break;
  }
 
  aodevice = ao_open_live(driver, &format, NULL /* no options */);
+
+ if ( aodevice == NULL && autoconfig ) {
+  format.byte_format = AO_FMT_NATIVE;
+  format.bits        = 16;
+  info->codec        = ROAR_CODEC_DEFAULT;
+  info->bits         = 16;
+  aodevice = ao_open_live(driver, &format, NULL /* no options */);
+ }
 
  if ( aodevice == NULL ) {