Changeset 220:abcf312e32d6 in roaraudio

Timestamp:

07/22/08 13:12:48 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some basic support for vars in codecfilter_cmd's options

File:

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

roard/codecfilter_cmd.c

@@ -2 +2 @@
 
 #include "roard.h"
+
+#define CMDMAXLEN 1024
 
 int cf_cmd_open(CODECFILTER_USERDATA_T * inst, int codec,
@@ -8 +10 @@
  int socks[2];
  int execed = -1;
+ char cmd[CMDMAXLEN+1] = {0};
+ char * tmp = NULL;
+ char   tb[CMDMAXLEN+1];
+ char * o = filter->options;
+ int i;
+
+ if ( !o )
+  return -1;
+
+ for (i = 0; i < CMDMAXLEN && *o != 0; i++, o++) {
+  if ( *o == '%' ) {
+//   printf("ol: *o='%c' (escape)\n", *o);
+   tmp = NULL;
+
+   o++;
+   if ( *o == 0 ) {
+    break;
+   } else if ( *o == 'R' ) {
+    tmp = tb;
+    snprintf(tb, CMDMAXLEN, "%i", g_sa->rate);
+   } else if ( *o == 'B' ) {
+    tmp = tb;
+    snprintf(tb, CMDMAXLEN, "%i", g_sa->bits);
+   } else if ( *o == 'C' ) {
+    tmp = tb;
+    snprintf(tb, CMDMAXLEN, "%i", g_sa->channels);
+   }
+
+//   printf("*o='%c', tmp=%p\n", *o, tmp);
+
+   if ( tmp ) {
+    for (; i < CMDMAXLEN && *tmp != 0; i++, tmp++)
+     cmd[i] = *tmp;
+    i--;
+   }
+  } else {
+//   printf("ol: *o='%c' (copy to cmd[i=%i])\n", *o, i);
+   cmd[i] = *o;
+  }
+ }
+
+ cmd[i+1] = 0;
+
+ printf("cmd='%s'\n", cmd);
 
  if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
@@ -13 +59 @@
  }
 
- if ( lib_run_bg(filter->options, ((struct roar_stream*)info)->fh, socks[1], ROAR_STDERR, socks, 2) == -1 )
+ if ( lib_run_bg(cmd, ((struct roar_stream*)info)->fh, socks[1], ROAR_STDERR, socks, 2) == -1 )
   return -1;