Changeset 5533:42f48072307c in roaraudio for roarclients/roarshout.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/roarshout.c (modified) (5 diffs)

roarclients/roarshout.c

@@ -37 +37 @@
 
  printf("    --server SERVER    - Set server hostname\n"
-        "    --rate   RATE      - Set sample rate\n"
-        "    --bits   BITS      - Set bits per sample\n"
-        "    --chans  CHANNELS  - Set number of channels\n"
-        "    --codec  CODEC     - Set the codec\n"
+        " -R --rate   RATE      - Set sample rate\n"
+        " -B --bits   BITS      - Set bits per sample\n"
+        " -C --chans  CHANNELS  - Set number of channels\n"
+        " -E --codec  CODEC     - Set the codec\n"
+        "    --aiprofile PROFILE\n"
+        "                       - Set audio profile\n"
         " -h --help             - Show this help\n"
         "    --pw-arg           - Password is supplied as argument (default).\n"
@@ -90 +92 @@
 int main (int argc, char * argv[]) {
  enum { ARG, ASK, DSTR } pw_source = ARG;
- int    rate     = 44100;
- int    bits     = 16;
- int    channels = 2;
- int    codec    = ROAR_CODEC_OGG_VORBIS;
+ struct roar_audio_info info;
  char * server   = NULL;
  char * k;
@@ -113 +112 @@
  char password_buf[128];
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
+ info.codec = ROAR_CODEC_OGG_VORBIS;
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -118 +122 @@
   if ( strcmp(k, "--server") == 0 ) {
    server = argv[++i];
-  } else if ( strcmp(k, "--rate") == 0 ) {
-   rate = roar_str2rate(argv[++i]);
-  } else if ( strcmp(k, "--bits") == 0 ) {
-   bits = roar_str2bits(argv[++i]);
-  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) {
-   channels = roar_str2channels(argv[++i]);
-  } else if ( strcmp(k, "--codec") == 0 ) {
-   codec = roar_str2codec(argv[++i]);
+  } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) {
+   info.rate = roar_str2rate(argv[++i]);
+  } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) {
+   info.bits = roar_str2bits(argv[++i]);
+  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) {
+   info.channels = roar_str2channels(argv[++i]);
+  } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) {
+   info.codec = roar_str2codec(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, "--pw-arg") == 0 ) {
    pw_source = ARG;
@@ -254 +263 @@
   shout_set_url(shout, s_url);
 
- if ( (vss = roar_vs_new_simple(server, "roarshout", rate, channels, codec, bits, ROAR_DIR_MONITOR, &err)) == NULL ) {
+ if ( (vss = roar_vs_new_simple(server, "roarshout",
+                                info.rate, info.channels, info.codec, info.bits,
+                                ROAR_DIR_MONITOR, &err)) == NULL ) {
   fprintf(stderr, "Error: can not start monitoring: %s\n", roar_vs_strerr(err));
   return 1;