Changeset 4144:2d2c2efff554 in roaraudio

Timestamp:

08/12/10 18:18:19 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated list of drivers to try, corrected a small bug

File:

• roard/roard.c (modified) (2 diffs)

roard/roard.c

@@ -745 +745 @@
 int add_default_output (char * drv, char * dev, char * opts, int prim, int count) {
  char * drvs[] = {
-#if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
-  "oss",
-#endif
-#ifdef ROAR_HAVE_LIBWINMM
-  "wmm",
-#endif
-#ifdef ROAR_HAVE_LIBAO
-  "ao",
-#endif
-#ifdef ROAR_HAVE_ESD
-  "esd",
-#endif
-#ifdef ROAR_HAVE_DRIVER_SYSCLOCK
-  "sysclock",
-#endif
-  "null",
+  // native and pseudo-native interfaces:
+  "oss", "alsa", "sndio", "wmm",
+  // sound libs:
+  "ao", "portaudio",
+  // other sound systems:
+  "esd", "rsound", "pulsesimple", "roar",
+  // specal buildins:
+  "sysclock", "null",
+  // terminator:
   NULL
  };
  int i;
  int ret;
+ int _alive;
 
  if ( drv != NULL )
@@ -775 +769 @@
  for (i = 0; drvs[i] != NULL; i++) {
   ROAR_INFO("add_default_output(*): trying driver %s", ROAR_DBG_INFO_INFO, drvs[i]);
+  _alive = alive; // save global alive setting
+
   ret = add_output(drvs[i], dev, opts, prim, count);
   if ( ret != -1 )
    return ret;
+
+  alive = _alive; // restore global alive setting
   ROAR_INFO("add_default_output(*): Driver %s faild to load", ROAR_DBG_INFO_VERBOSE, drvs[i]);
  }