Changeset 550:2c57af617cf8 in roaraudio

Timestamp:

08/18/08 18:16:32 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed order of -s and -S, now -S implays start of source not -s, -s got default to cf

File:

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

roard/roard.c

@@ -91 +91 @@
  int      port = ROAR_DEFAULT_PORT;
  int               drvid;
- char * s_dev     = NULL;
+ char * s_drv     = "cf";
  char * s_con     = NULL;
  char * s_opt     = NULL;
@@ -195 +195 @@
 
   } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) {
+   s_drv = argv[++i];
+  } else if ( strcmp(k, "-S") == 0 ) {
    k = argv[++i];
-   if ( sources_add(k, s_dev, s_con, s_opt, s_prim) == -1 ) {
-    ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, k);
-   }
-   s_opt = s_dev = s_con = NULL;
+   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;
-  } else if ( strcmp(k, "-S") == 0 ) {
-   s_dev = argv[++i];
   } else if ( strcmp(k, "-sO") == 0 ) {
    s_opt = argv[++i];