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

roarclients/roarradio.c

@@ -35 +35 @@
  printf("\nOptions:\n\n");
 
- 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"
-        "  --help             - Show this help\n"
+ printf("  --server SERVER      - Set server hostname\n"
+        "  --rate  -R RATE      - Set sample rate\n"
+        "  --bits  -B BITS      - Set bits per sample\n"
+        "  --chans -C CHANNELS  - Set number of channels\n"
+        "  --codec -E CODEC     - Set the codec\n"
+        "  --aiprofile PROFILE  - Set audio profile\n"
+        "  --help               - Show this help\n"
        );
 
@@ -51 +52 @@
 
 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;
  char * server   = NULL;
  char * k;
@@ -69 +67 @@
  ssize_t slen;
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
+ info.codec = ROAR_CODEC_OGG_VORBIS;
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -74 +77 @@
   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, "--help") == 0 ) {
    usage();
@@ -206 +214 @@
  }
 
- if ( roar_stream_new(stream, rate, channels, bits, codec) == -1 ) {
+ if ( roar_stream_new(stream, info.rate, info.channels, info.bits, info.codec) == -1 ) {
   roar_disconnect(con);
   return 1;