Changeset 1507:ff0c9920a154 in roaraudio

Timestamp:

04/04/09 11:51:45 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed bug reported by Ionic to add short options as stated in the manpage and added esdfilt compatible options to roarfilt

Location:

roarclients

Files:

• roarcat.c (modified) (2 diffs)
• roarfilt.c (modified) (1 diff)
• roarmon.c (modified) (2 diffs)

roarclients/roarcat.c

@@ -32 +32 @@
  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     CODEC     - Set the codec\n"
+        "  --help                - Show this help\n"
        );
 
@@ -62 +62 @@
   } 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") ) {
    rate = atoi(argv[++i]);
-  } else if ( !strcmp(k, "--bits") ) {
+  } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
    bits = atoi(argv[++i]);
   } else if ( !strcmp(k, "-b") ) {
    bits = 8;
-  } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") ) {
+  } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
    channels = atoi(argv[++i]);
   } else if ( !strcmp(k, "-m") ) {

roarclients/roarfilt.c

@@ -166 +166 @@
   if ( strcmp(k, "--server") == 0 ) {
    server = argv[++i];
-  } else if ( strcmp(k, "--rate") == 0 ) {
+  } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 || strcmp(k, "-r") == 0 ) {
    rate = atoi(argv[++i]);
-  } else if ( strcmp(k, "--bits") == 0 ) {
+  } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) {
    bits = atoi(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 ) {
    channels = atoi(argv[++i]);
-  } else if ( strcmp(k, "--half") == 0 ) {
+  } else if ( strcmp(k, "-b") == 0 ) {
+   bits = 8;
+  } else if ( strcmp(k, "-m") == 0 ) {
+   channels = 1;
+  } else if ( strcmp(k, "--half") == 0 || strcmp(k, "-half") == 0 ) {
    div *= 2;
-  } else if ( strcmp(k, "--double") == 0 ) {
+  } else if ( strcmp(k, "--double") == 0 || strcmp(k, "-double") == 0 ) {
    mul *= 2;
   } else if ( strcmp(k, "--amp") == 0 ) {

roarclients/roarmon.c

@@ -32 +32 @@
  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    CODEC     - Set the codec\n"
+        "  --help               - Show this help\n"
        );
 
@@ -61 +61 @@
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
    server = argv[++i];
-  } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") ) {
+  } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
    rate = atoi(argv[++i]);
-  } else if ( !strcmp(k, "--bits") ) {
+  } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
    bits = atoi(argv[++i]);
   } else if ( !strcmp(k, "-b") ) {
    bits = 8;
-  } else if ( !strcmp(k, "--channels") ) {
+  } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
    channels = atoi(argv[++i]);
   } else if ( !strcmp(k, "-m") ) {