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

roarclients/roarcatvio.c

@@ -33 +33 @@
  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 -s 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"
        );
 
@@ -44 +45 @@
 
 int main (int argc, char * argv[]) {
- struct roar_audio_info info = {.rate = ROAR_RATE_DEFAULT, .bits = ROAR_BITS_DEFAULT, .channels = ROAR_CHANNELS_DEFAULT};
- int    codec    = -1;
+ struct roar_audio_info info = {.rate = ROAR_RATE_DEFAULT,
+                                .bits = ROAR_BITS_DEFAULT,
+                                .channels = ROAR_CHANNELS_DEFAULT,
+                                .codec = ROAR_AUDIO_INFO_INVALID};
  int    auinfo_changed = 0;
  char * server   = NULL;
@@ -62 +65 @@
   } else if ( !strcmp(k, "-n") ) {
    name = argv[++i];
-  } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") ) {
+  } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
    info.rate = roar_str2rate(argv[++i]);
    auinfo_changed = 1;
-  } else if ( !strcmp(k, "--bits") ) {
+  } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
    info.bits = roar_str2bits(argv[++i]);
    auinfo_changed = 1;
@@ -71 +74 @@
    info.bits = 8;
    auinfo_changed = 1;
-  } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") ) {
+  } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
    info.channels = roar_str2channels(argv[++i]);
    auinfo_changed = 1;
@@ -77 +80 @@
    info.channels = 1;
    auinfo_changed = 1;
-  } else if ( !strcmp(k, "--codec") ) {
-   codec = roar_str2codec(argv[++i]);
+  } else if ( !strcmp(k, "--codec") || !strcmp(k, "-E") ) {
+   info.codec = roar_str2codec(argv[++i]);
+   auinfo_changed = 1;
+  } 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;
+   }
    auinfo_changed = 1;
   } else if ( !strcmp(k, "--help") ) {
@@ -92 +101 @@
  }
 
- if ( codec == -1 )
-  codec = ROAR_CODEC_DEFAULT;
-
- info.codec = codec;
+ if ( info.codec == ROAR_AUDIO_INFO_INVALID )
+  info.codec = ROAR_CODEC_DEFAULT;
 
  if ( (vss = roar_vs_new(server, name, &err)) == NULL ) {