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

roarclients/roarphone.c

@@ -114 +114 @@
 
  printf("\nAudio Options:\n\n");
- printf("  --rate     RATE      - Set sample rate\n"
-        "  --bits     BITS      - Set bits per sample\n"
-        "  --chans    CHANNELS  - Set number of channels\n"
+ printf("  --rate  -R RATE      - Set sample rate\n"
+        "  --bits  -B BITS      - Set bits per sample\n"
+        "  --chans -C CHANNELS  - Set number of channels\n"
+        "  --aiprofile PROFILE  - Set audio profile\n"
        );
 
@@ -129 +130 @@
 
  printf("\nCodec Options:\n\n");
- printf("  --codec    CODEC     - Set the codec\n"
+ printf("  --codec -E CODEC     - Set the codec\n"
         "  --transcode          - Use local transcodeing\n"
        );
@@ -436 +437 @@
   } else if ( strcmp(k, "--io-flush") == 0 ) {
    g_conf.ioflush_interval = atoi(argv[++i]);
-  } else if ( strcmp(k, "--rate") == 0 ) {
+  } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) {
    info.rate = roar_str2rate(argv[++i]);
-  } else if ( strcmp(k, "--bits") == 0 ) {
+  } 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 ) {
+  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) {
    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, "--afi-downmix") == 0 ) {
@@ -459 +465 @@
    g_conf.filter.in.speex_prep_vad = 1;
 
-  } else if ( strcmp(k, "--codec") == 0 ) {
+  } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) {
    info.codec = roar_str2codec(argv[++i]);