Changeset 1110:1bdd5d4d74f2 in roaraudio

Timestamp:

01/14/09 18:39:20 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added -sN, start new on source on -sN and end of parameters

File:

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

roard/roard.c

@@ -222 +222 @@
  int               drvid;
  char * s_drv     = "cf";
+ char * s_dev     = NULL;
  char * s_con     = NULL;
  char * s_opt     = NULL;
@@ -359 +360 @@
    s_drv = argv[++i];
   } else if ( strcmp(k, "-S") == 0 ) {
-   k = argv[++i];
-   if ( sources_add(s_drv, k, s_con, s_opt, s_prim) == -1 ) {
-    ROAR_ERR("main(*): adding source '%s' via '%s' failed!", k, s_drv);
-   }
-   s_opt = s_con = NULL;
-   s_prim = 0;
+   s_dev = argv[++i];
   } else if ( strcmp(k, "-sO") == 0 ) {
    s_opt = argv[++i];
@@ -371 +367 @@
   } else if ( strcmp(k, "-sP") == 0 ) {
    s_prim = 1;
+  } else if ( strcmp(k, "-sN") == 0 ) {
+   if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
+    ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, s_drv);
+   }
+   s_opt = s_dev = s_con = NULL;
+   s_drv = "cf";
+   s_prim = 0;
 
   } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {
@@ -452 +455 @@
   }
 
+ }
+
+ if ( s_dev != NULL ) {
+  if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
+   ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, s_drv);
+  }
  }