Changeset 196:5625b89335c7 in roaraudio

Timestamp:

07/20/08 21:30:58 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic support for codecfilter_cmd

Location:

roard

Files:

• codecfilter.c (modified) (2 diffs)
• codecfilter_cmd.c (modified) (1 diff)
• include/codecfilter_cmd.h (modified) (1 diff)

roard/codecfilter.c

@@ -5 +5 @@
 struct roar_codecfilter g_codecfilter[] = {
  {-1,                     "null", "null codec filter", NULL,                      NULL, NULL, NULL, NULL, NULL, NULL},
- {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",            "ogg123 -q -d raw -f - -", NULL, NULL, NULL, NULL, NULL, NULL},
+ {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",            "ogg123 -q -d raw -f - -", cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
 
  {-1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list
@@ -40 +40 @@
  }
 
- info->filter = *codecfilter_id;
+ info->codecfilter = *codecfilter_id;
 
  if (*codecfilter_id != -1) {

roard/codecfilter_cmd.c

@@ -3 +3 @@
 #include "roard.h"
 
+int cf_cmd_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                             struct roar_stream_server * info,
+                                             struct roar_codecfilter   * filter) {
+ int socks[2];
+
+ if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
+  return -1;
+ }
+
+ if ( lib_run_bg(filter->options, ((struct roar_stream*)info)->fh, socks[1], ROAR_STDERR) == -1 )
+  return -1;
+
+ ((struct roar_stream*)info)->fh = socks[0];
+ ((struct roar_stream*)info)->info.codec = ROAR_CODEC_DEFAULT;
+ close(socks[1]);
+
+ info->codecfilter = -1;
+
+ return 0;
+}
+
 //ll

roard/include/codecfilter_cmd.h

@@ -6 +6 @@
 #include <roaraudio.h>
 
+int cf_cmd_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                             struct roar_stream_server * info,
+                                             struct roar_codecfilter   * filter);
+
 #endif