Changeset 1130:f09016f2d64f in roaraudio for roarclients/roarmonhttp.c

Timestamp:

01/17/09 18:08:32 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to roarmonhttp to get source stream via libshout

File:

• roarclients/roarmonhttp.c (modified) (7 diffs)

roarclients/roarmonhttp.c

@@ -136 +136 @@
 int parse_http (void) {
  char buf[1024];
- char * qs, *str;
+ char * qs = buf, *str;
  ssize_t len;
+ int dir = ROAR_DIR_MONITOR;
 
  if ( (len = read(ROAR_STDIN, buf, 1023)) == -1 )
@@ -144 +145 @@
  buf[len] = 0;
 
- if ( strncmp(buf, "GET /", 5) )
-  return -1;
-
- qs = buf+5;
+ if ( strncmp(buf, "GET /", 5) ) {
+  if ( strncmp(buf, "SOURCE /", 8) ) {
+   return -1;
+  } else {
+   dir = ROAR_DIR_PLAY;
+   qs += 3; 
+  }
+ }
+
+ qs += 5;
 
  if ( (str = strstr(qs, " ")) == NULL )
@@ -168 +175 @@
  setenv("QUERY_STRING", qs, 1);
 
- return 0;
+ return dir;
 }
 
@@ -181 +188 @@
  char * c, * k, * v;
  char * sp0, * sp1;
+ int dir = ROAR_DIR_MONITOR;
 
  alarm(0); // reset alarm timers from httpd 
@@ -186 +194 @@
  if ( argc > 1 )
   if ( ! strcmp(argv[1], "--inetd") )
-   if ( parse_http() == -1 )
+   if ( (dir = parse_http()) == -1 )
     return 1;
 
@@ -212 +220 @@
 
 
- if ( (fh = roar_simple_monitor(rate, channels, bits, codec, server, "roarmon")) == -1 ) {
+ if ( (fh = roar_simple_stream(rate, channels, bits, codec, server, dir, "roarmonhttp")) == -1 ) {
 //  fprintf(stderr, "Error: can not start monitoring\n");
   return 1;
@@ -225 +233 @@
 */
 
- stream(ROAR_STDOUT, fh);
+ switch (dir) {
+  case ROAR_DIR_PLAY:
+    stream(fh, ROAR_STDIN);
+   break;
+  case ROAR_DIR_MONITOR:
+    stream(ROAR_STDOUT, fh);
+   break;
+ }
 
  roar_simple_close(fh);