Changeset 5533:42f48072307c in roaraudio for roarclients/roarmonhttp.c

Timestamp:

06/12/12 14:39:40 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed usage of -R/-B/-C/-E as well as --aiprofile in roarclients (Closes: #176)

File:

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

roarclients/roarmonhttp.c

@@ -47 +47 @@
         "  --bits  -B  BITS      - Set bits per sample\n"
         "  --chans -C  CHANNELS  - Set number of channels\n"
-        "  --codec     CODEC     - Set the codec\n"
+        "  --codec -E  CODEC     - Set the codec\n"
+        "  --aiprofile PROFILE   - Set audio profile\n"
         "  --rel-id ID           - Set ID of relative stream\n"
         "  --inetd               - Start in inetd mode (STDIN and STDOUT connected to socket)\n"
@@ -231 +232 @@
 
 int main (int argc, char * argv[]) {
- int    rate     = 44100;
- int    bits     = 16;
- int    channels = 2;
- int    codec    = ROAR_CODEC_OGG_VORBIS;
+ struct roar_audio_info info;
  int    rel_id   = -1;
  int    sflags   = ROAR_FLAG_NONE;
@@ -252 +250 @@
 #endif
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
+ info.codec = ROAR_CODEC_OGG_VORBIS;
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -263 +266 @@
   } else if ( !strcmp(k, "--server") ) {
    roar_libroar_set_server(argv[++i]);
-  } else if ( !strcmp(k, "--codec") ) {
-   codec = roar_str2codec(argv[++i]);
+  } else if ( !strcmp(k, "--codec") || !strcmp(k, "-E") ) {
+   info.codec = roar_str2codec(argv[++i]);
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
-   rate = roar_str2rate(argv[++i]);
+   info.rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
-   bits = roar_str2bits(argv[++i]);
+   info.bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
-   channels = roar_str2channels(argv[++i]);
+   info.channels = roar_str2channels(argv[++i]);
+  } else if ( !strcmp(k, "--aiprofile") ) {
+   if ( roar_profile2info(&info, argv[++i]) == -1 ) {
+    fprintf(stderr, "Error: Can not load audio profile: %s: %s\n", argv[i], roar_error2str(roar_error));
+    return 1;
+   }
   } else if ( !strcmp(k, "--rel-id") ) {
    rel_id = atoi(argv[++i]);
@@ -294 +302 @@
 
   if ( !strcmp(k, "codec") ) {
-   if ( (codec = roar_str2codec(v)) == -1 )
+   if ( (info.codec = roar_str2codec(v)) == ROAR_AUDIO_INFO_INVALID )
     return 1;
   } else if ( !strcmp(k, "channels") ) {
-   channels = roar_str2channels(v);
+   info.channels = roar_str2channels(v);
   } else if ( !strcmp(k, "rate") ) {
-   rate = roar_str2rate(v);
+   info.rate = roar_str2rate(v);
   } else if ( !strcmp(k, "bits") ) {
-   bits = roar_str2bits(v);
+   info.bits = roar_str2bits(v);
+  } else if ( !strcmp(k, "aiprofile") ) {
+   if ( roar_profile2info(&info, v) == -1 )
+    return 1;
   } else if ( !strcmp(k, "rel-id") || !strcmp(k, "relid") ) {
    rel_id = atoi(v);
@@ -328 +339 @@
  }
 
- if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
+ if ( roar_stream_new(&s, info.rate, info.channels, info.bits, info.codec) == -1 ) {
   roar_disconnect(&con);
   return 20;
@@ -361 +372 @@
 
  if ( !gopher )
-  print_header(codec, rate, channels);
+  print_header(info.codec, info.rate, info.channels);
 
 /*