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

roarclients/roarvumeter.c

@@ -45 +45 @@
  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"
-        "  --samples SAMPLES  - Set number of input samples per block\n"
-        "  --pc               - Use percent scale\n"
-        "  --db               - Use dB scale\n"
-        "  --beat             - Enable beat detection\n"
-        "  --lowpass FREQ     - Use lowpass to filter input (-%idB/dec)\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 CHANS    - Set number of channels\n"
+        "  --aiprofile PROFILE - Set audio profile\n"
+        "  --samples SAMPLES   - Set number of input samples per block\n"
+        "  --pc                - Use percent scale\n"
+        "  --db                - Use dB scale\n"
+        "  --beat              - Enable beat detection\n"
+        "  --lowpass FREQ      - Use lowpass to filter input (-%idB/dec)\n"
+        "  --help              - Show this help\n",
         LOWPASS_ORDER * 20
        );
@@ -163 +164 @@
  struct roardsp_filter      * filter;
  float  lowpass_freq = 0;
- int    rate     = ROAR_RATE_DEFAULT;
- int    bits     = 16;
- int    channels = 2;
- int    codec    = ROAR_CODEC_DEFAULT;
+ struct roar_audio_info info;
  int    samples  = -1;
  char * server   = NULL;
@@ -174 +172 @@
  int    mode = 0;
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -179 +180 @@
   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, "--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, "--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, "--samples") == 0 ) {
    samples = atoi(argv[++i]);
@@ -213 +219 @@
 
  if ( samples == -1 )
-  samples = rate/10;
+  samples = info.rate/10;
 
  if ( roar_simple_connect(&con, server, "roarvumeter") == -1 ) {
@@ -220 +226 @@
  }
 
- if ( roar_vio_simple_new_stream_obj(&stream, &con, &s, rate, channels, bits, codec, ROAR_DIR_MONITOR, -1) == -1) {
+ if ( roar_vio_simple_new_stream_obj(&stream, &con, &s,
+                                     info.rate, info.channels, info.bits, ROAR_CODEC_DEFAULT,
+                                     ROAR_DIR_MONITOR, -1) == -1) {
   fprintf(stderr, "Error: can not start monetoring\n");
   return 1;
@@ -262 +270 @@
  }
 
- vumeter(&re, samples*channels, bits, channels, mode, &fchain);
+ vumeter(&re, samples*info.channels, info.bits, info.channels, mode, &fchain);
 
  printf("\n"); // if the reach this then roard has quited and we should print a newline