Changeset 2272:7fa0fd1e5a5d in roaraudio

Timestamp:

08/04/09 13:06:48 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use a search loop :)

File:

• roard/sources.c (modified) (1 diff)

roard/sources.c

@@ -85 +85 @@
 
 int sources_add (char * driver, char * device, char * container, char * options, int primary) {
- if (0) {
-#ifdef ROAR_HAVE_IO_POSIX
- } else if ( strcmp(driver, "raw") == 0 ) {
-  return sources_add_raw(driver, device, container, options, primary);
- } else if ( strcmp(driver, "wav") == 0 ) {
-  return sources_add_wav(driver, device, container, options, primary);
-#endif
- } else if ( strcmp(driver, "cf") == 0 ) {
-  return sources_add_cf(driver, device, container, options, primary);
- } else if ( strcmp(driver, "roar") == 0 ) {
-  return sources_add_roar(driver, device, container, options, primary);
- }
-
+ int i;
+
+ for (i = 0; g_source[i].name != NULL; i++) {
+  if ( !strcmp(g_source[i].name, driver) ) {
+   if ( g_source[i].new_open != NULL ) {
+    // TODO: add code to open driver here...
+   } else if ( g_source[i].old_open != NULL ) {
+    return g_source[i].old_open(driver, device, container, options, primary);
+   } else {
+    ROAR_ERR("sources_add(driver='%s', ...): Found source but did not find any open rutine", driver);
+    return -1;
+   }
+  }
+ }
+
+ ROAR_ERR("sources_add(driver='%s', ...): Source not found", driver);
  return -1;
 }