Changeset 2339:11e0b3d23f74 in roaraudio

Timestamp:

08/13/09 22:10:26 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added --stream-flags

File:

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

roard/roard.c

@@ -63 +63 @@
         " -B  --bits   BITS     - Set server bits\n"
         " -C  --chans  CHANNELS - Set server channels\n"
+       );
+
+ printf("\nStream Options:\n\n");
+ printf(
+        " --stream-flags D=F    - Set default flags for stream directions\n"
+        "                         D is the stream direction and F is a comma seperated\n"
+        "                         list of flags in form +flag or -flag to set or unset\n"
+        "                         a flag as default or remove it from the default\n"
        );
 
@@ -212 +220 @@
 }
 
+#define FOP_ADD   1
+#define FOP_DEL  -1
+
+int update_stream_flags (char * str) {
+ int    dir;
+ char * flags;
+ char * k;
+ int    op;
+ int    flag;
+
+ if ( (flags = strstr(str, "=")) == NULL )
+  return -1;
+
+ *flags = 0;
+  flags++;
+
+ if ( (dir = roar_str2dir(str)) == -1 )
+  return -1;
+
+ while (flags != NULL) {
+  k = flags;
+  flags = strstr(flags, ",");
+
+  if ( flags != NULL )
+   *(flags++) = 0;
+
+  switch (*k) {
+   case '+': k++; op = FOP_ADD; break;
+   case '-': k++; op = FOP_DEL; break;
+   default:
+     op = FOP_ADD;
+  }
+
+  flag = 0;
+
+  if ( !strcmp(k, "sync") ) {
+   flag = ROAR_FLAG_SYNC;
+  } else if ( !strcmp(k, "meta") ) {
+   flag = ROAR_FLAG_META;
+  } else if ( !strcmp(k, "cleanmeta") ) {
+   flag = ROAR_FLAG_CLEANMETA;
+  } else if ( !strcmp(k, "pause") ) {
+   flag = ROAR_FLAG_PAUSE;
+  } else if ( !strcmp(k, "mute") ) {
+   flag = ROAR_FLAG_MUTE;
+  } else if ( !strcmp(k, "antiecho") ) {
+   flag = ROAR_FLAG_ANTIECHO;
+  } else {
+   return -1;
+  }
+
+  g_config->streams[dir].flags |= flag;
+
+  if ( op == FOP_DEL )
+   g_config->streams[dir].flags -= flag;
+ }
+
+ return 0;
+}
+
 int add_output (char * drv, char * dev, char * opts, int prim, int count) {
  int stream;
@@ -755 +823 @@
   } else if ( strcmp(k, "-C") == 0 || strcmp(k, "--chans") == 0 ) {
    sa.channels = atoi(argv[++i]);
+
+  } else if ( strcmp(k, "--stream-flags") == 0 ) {
+   if ( update_stream_flags(argv[++i]) == -1 ) {
+    ROAR_ERR("Can not set stream flags");
+    return 1;
+   }
 
   } else if ( strcmp(k, "-d") == 0 || strcmp(k, "--driver") == 0 ) {