Changeset 2813:f677c459d89d in roaraudio

Timestamp:

09/29/09 18:00:18 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added prethru support

Location:

roarclients

Files:

• roarmon.c (modified) (4 diffs)
• roarmonhttp.c (modified) (5 diffs)

roarclients/roarmon.c

@@ -44 +44 @@
         "  --rdtcs              - Output Radio Data and Transmitter Control System data\n"
         "  --thru               - Output copy of other stream\n"
+        "  --prethru            - Sets prethru flag on stream\n"
         "  --rel-id ID          - Set ID of relative stream\n"
         "  --help               - Show this help\n"
@@ -60 +61 @@
  char * k;
  int    i;
+ int    prethru  = 0;
  struct roar_connection    con;
  struct roar_stream        s;
@@ -112 +114 @@
    rel_id = atoi(argv[++i]);
 
+  } else if ( !strcmp(k, "--prethru") ) {
+   prethru = 1;
+
   } else if ( !strcmp(k, "--help") || !strcmp(k, "-h") ) {
    usage();
@@ -194 +199 @@
  }
 
+ if ( prethru ) {
+  if ( roar_stream_set_flags(&con, &s, ROAR_FLAG_PRETHRU, 0) == -1 ) {
+   fprintf(stderr, "Error: can not set prethru flag on stream\n");
+   roar_disconnect(&con);
+   return 14;
+  }
+ }
+
  if ( roar_stream_exec(&con, &s) == -1 ) {
   fprintf(stderr, "Error: can not exec stream\n");

roarclients/roarmonhttp.c

@@ -211 +211 @@
  int    channels = 2;
  int    codec    = ROAR_CODEC_OGG_VORBIS;
+ int    rel_id   = -1;
+ int    sflags   = ROAR_FLAG_NONE;
 // int    codec    = ROAR_CODEC_DEFAULT;
  char * server   = NULL;
@@ -220 +222 @@
  int dir = ROAR_DIR_MONITOR;
  int gopher = 0;
+ struct roar_connection    con;
+ struct roar_stream        s;
 
 #ifdef ROAR_HAVE_ALARM
@@ -261 +265 @@
   } else if ( !strcmp(k, "bits") ) {
    bits = atoi(v);
+  } else if ( !strcmp(k, "rel-id") || !strcmp(k, "relid") ) {
+   rel_id = atoi(v);
+  } else if ( !strcmp(k, "set-flag") ) {
+   if ( !strcmp(v, "meta") ) {
+    sflags |= ROAR_FLAG_META;
+   } else if ( !strcmp(v, "cleanmeta") ) {
+    sflags |= ROAR_FLAG_CLEANMETA;
+   } else if ( !strcmp(v, "prethru") ) {
+    sflags |= ROAR_FLAG_PRETHRU;
+   } else {
+    return 1;
+   }
+  } else if ( !strcmp(k, "dir") ) {
+   if ( (dir = roar_str2dir(v)) == -1 )
+    return 1;
   } else {
    return 1;
@@ -272 +291 @@
  }
 
-
- if ( (fh = roar_simple_stream(rate, channels, bits, codec, server, dir, "roarmonhttp")) == -1 ) {
-//  fprintf(stderr, "Error: can not start monitoring\n");
+ if ( roar_simple_connect(&con, server, "roarmonhttp") == -1 ) {
+  return 10;
+ }
+
+ if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
+  roar_disconnect(&con);
+  return 20;
+ }
+
+ if ( rel_id != -1 ) {
+  if ( roar_stream_set_rel_id(&s, rel_id) ) {
+   roar_disconnect(&con);
+   return 21;
+  }
+ }
+
+ if ( roar_stream_connect(&con, &s, dir) == -1 ) {
+  roar_disconnect(&con);
+  return 11;
+ }
+
+ if ( sflags != ROAR_FLAG_NONE ) {
+  if ( roar_stream_set_flags(&con, &s, sflags, 0) == -1 ) {
+   roar_disconnect(&con);
+   return 14;
+  }
+ }
+
+ if ( roar_stream_exec(&con, &s) == -1 ) {
+  roar_disconnect(&con);
+  return 12;
+ }
+
+ if ( (fh = roar_get_connection_fh(&con)) == -1 )
   return 1;
- }
 
  if ( !gopher )
@@ -292 +341 @@
    break;
   case ROAR_DIR_MONITOR:
+  case ROAR_DIR_THRU:
     stream(ROAR_STDOUT, fh);
    break;