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

roarclients/roarfilt.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"
-        "  --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"
+        "  --aiprofile PROFILE - Set audio profile\n"
+        "  --help              - Show this help\n"
         "\n"
-        "  --half             - half the volume\n"
-        "  --double           - double the volume\n"
-        "  --amp VAL          - Set amplification\n"
-        "  --mul VAL          - Set mul\n"
-        "  --div VAL          - Set div\n"
-#ifdef ROAR_HAVE_LIBM
-        "  --lowpass freq     - lowpass filter (obsolete)\n"
-#endif
-        "  --filter  name     - add filter name\n"
-        "  --ffreq   freq     - set filter freq\n"
-        "  --fmul    mult     - set filter multiplier\n"
-        "  --fdiv    div      - set filter divider\n"
-        "  --fn      N        - set filter N parameter\n"
-        "  --flimit  limit    - set filter limit parameter\n"
-        "  --fmode   mode     - set filter mode parameter\n"
-        "  --fq      Q        - set filter quality\n"
+        "  --half              - half the volume\n"
+        "  --double            - double the volume\n"
+        "  --amp VAL           - Set amplification\n"
+        "  --mul VAL           - Set mul\n"
+        "  --div VAL           - Set div\n"
+#ifdef ROAR_HAVE_LIBM
+        "  --lowpass freq      - lowpass filter (obsolete)\n"
+#endif
+        "  --filter  name      - add filter name\n"
+        "  --ffreq   freq      - set filter freq\n"
+        "  --fmul    mult      - set filter multiplier\n"
+        "  --fdiv    div       - set filter divider\n"
+        "  --fn      N         - set filter N parameter\n"
+        "  --flimit  limit     - set filter limit parameter\n"
+        "  --fmode   mode      - set filter mode parameter\n"
+        "  --fq      Q         - set filter quality\n"
        );
 
@@ -176 +177 @@
   } else if ( strcmp(k, "-m") == 0 ) {
    info.channels = 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;
+   }
+   info.codec = ROAR_CODEC_DEFAULT;
   } else if ( strcmp(k, "--half") == 0 || strcmp(k, "-half") == 0 ) {
    div *= 2;