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

roarclients/roarbidir.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 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[]) {
- int    rate     = ROAR_RATE_DEFAULT;
- int    bits     = ROAR_BITS_DEFAULT;
- int    channels = ROAR_CHANNELS_DEFAULT;
- int    codec    = ROAR_CODEC_DEFAULT;
+ struct roar_audio_info info;
  char * server   = NULL;
  char * k;
@@ -61 +59 @@
  ssize_t ret;
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
  if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 )
   return 1;
@@ -69 +70 @@
   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();
@@ -93 +99 @@
  }
 
- if ( (vss = roar_vs_new_simple(server, "roarbidir", rate, channels, codec, bits, ROAR_DIR_BIDIR, &err)) == NULL ) {
+ if ( (vss = roar_vs_new_simple(server, "roarbidir",
+                                info.rate, info.channels, info.codec, info.bits,
+                                ROAR_DIR_BIDIR, &err)) == NULL ) {
   fprintf(stderr, "Error: can not start playback: %s\n", roar_error2str(err));
   if ( in != NULL )