Changeset 1018:867bbc1c4dec in roaraudio

Timestamp:

12/21/08 11:45:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some bugs within the select loop, added some frame code for codec selection

File:

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

roarclients/roarmonhttp.c

@@ -34 +34 @@
     mime = "application/ogg";
    break;
+  case ROAR_CODEC_RIFF_WAVE:
+    mime = "audio/x-wav";
+   break;
  }
 
@@ -59 +62 @@
   FD_ZERO(fso);
   FD_SET(src, fsi);
-  FD_SET(dest, fso);
+  if ( ring != NULL ) {
+   FD_SET(dest, fso);
+  }
 
   tv.tv_sec  = 0;
@@ -85 +90 @@
       break;
     }
+
+    if ( roar_buffer_set_len(cur, len) == -1 )
+     return -1;
 
     if ( ring == NULL ) {
@@ -126 +134 @@
  int    bits     = 16;
  int    channels = 2;
-// int    codec    = ROAR_CODEC_OGG_VORBIS;
- int    codec    = ROAR_CODEC_DEFAULT;
+ int    codec    = ROAR_CODEC_OGG_VORBIS;
+// int    codec    = ROAR_CODEC_DEFAULT;
  char * server   = NULL;
  int    fh;
+ char * c, * k, * v;
+ char * sp0, * sp1;
+ 
+
+ c = strtok_r(getenv("QUERY_STRING"), "&", &sp0);
+
+ while (c != NULL) {
+  k = strtok_r(c,    "=", &sp1);
+  v = strtok_r(NULL, "=", &sp1);
+
+  if ( !strcmp(k, "codec") ) {
+   if ( (codec = roar_str2codec(v)) == -1 )
+    return 1;
+  } else {
+   return 1;
+  }
+
+  c = strtok_r(NULL, "&", &sp0);
+ }
+
 
  if ( (fh = roar_simple_monitor(rate, channels, bits, codec, server, "roarmon")) == -1 ) {
-  fprintf(stderr, "Error: can not start monitoring\n");
+//  fprintf(stderr, "Error: can not start monitoring\n");
   return 1;
  }