Changeset 4141:b36fa38ea35e in roaraudio

Timestamp:

08/12/10 15:26:59 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

enable new default behavor

Location:

roard

Files:

• include/driver.h (modified) (2 diffs)
• roard.c (modified) (7 diffs)

roard/include/driver.h

@@ -31 +31 @@
 #define DRIVER_USERDATA_T void *
 
+#if 0
 #ifndef ROAR_DRIVER_DEFAULT
 
@@ -55 +56 @@
 #endif
 
+#endif
 #endif
 

roard/roard.c

@@ -43 +43 @@
 #endif
 
+int add_output (char * drv, char * dev, char * opts, int prim, int count);
+
 #ifdef ROAR_HAVE_MAIN_ARGS
 void usage (void) {
@@ -93 +95 @@
 
  printf("\nDriver Options: (obsolete, do not use, Use Ouput Options)\n\n");
+#ifdef ROAR_DRIVER_DEFAULT
  printf(" -d  --driver DRV      - Set the driver (default: %s)\n", ROAR_DRIVER_DEFAULT);
+#else
+ printf(" -d  --driver DRV      - Set the driver (default: autodetect)\n");
+#endif
  printf(" -D  --device DEV      - Set the device\n");
  printf(" -dO OPTS              - Set output options\n");
@@ -738 +744 @@
 #else
 int add_default_output (char * drv, char * dev, char * opts, int prim, int count) {
- char drvs[] = {
+ char * drvs[] = {
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
   "oss",
@@ -764 +770 @@
 
  if ( dev != NULL ) {
-  ROAR_WARN("add_output(drv=(none), dev='%s', opts='%s', prim=%i, count=%i): It's not recommended to use device name without driver name.", dev, opts, prim, count);
+  ROAR_WARN("add_default_output(drv=(none), dev='%s', opts='%s', prim=%i, count=%i): It's not recommended to use device name without driver name.", dev, opts, prim, count);
  }
 
  for (i = 0; drvs[i] != NULL; i++) {
+  ROAR_INFO("add_default_output(*): trying driver %s", ROAR_DBG_INFO_INFO, drvs[i]);
   ret = add_output(drvs[i], dev, opts, prim, count);
   if ( ret != -1 )
    return ret;
+  ROAR_INFO("add_default_output(*): Driver %s faild to load", ROAR_DBG_INFO_VERBOSE, drvs[i]);
  }
 
@@ -798 +806 @@
 
  if ( drv == NULL && count == 0 ) {
+#ifdef ROAR_DRIVER_DEFAULT
   drv  = ROAR_DRIVER_DEFAULT;
   prim = 1;
@@ -806 +815 @@
    opts = to_free = strdup("codec=" ROAR_DRIVER_CODEC);
   }
+#endif
+#else
+  ROAR_ERR("add_output(*): Can not find default driver");
+  return -1;
 #endif
  }
@@ -1964 +1977 @@
 #endif
 
- add_output(o_drv, o_dev, o_opts, o_prim, o_count);
+ add_default_output(o_drv, o_dev, o_opts, o_prim, o_count);
 
  ROAR_INFO("Server config: rate=%i, bits=%i, chans=%i", ROAR_DBG_INFO_NOTICE, sa.rate, sa.bits, sa.channels);