Changeset 4883:c56aedd9d0cb in roaraudio

Timestamp:

04/26/11 21:39:10 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added functions to access symbolic names for audio info parameters (Closes: #51)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/stream.h (modified) (1 diff)
• libroar/stream.c (modified) (1 diff)
• roarclients/roarbidir.c (modified) (2 diffs)
• roarclients/roarcat.c (modified) (1 diff)
• roarclients/roardtmf.c (modified) (1 diff)
• roarclients/roarmon.c (modified) (1 diff)
• roarclients/roarmonhttp.c (modified) (2 diffs)
• roarclients/roarphone.c (modified) (1 diff)

ChangeLog

@@ -2 +2 @@
         * Added new error codes.
         * Improved listing of audio profiles.
+        * Added functions to access symbolic names for audio info parameters (Closes: #51)
 
 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST

include/libroar/stream.h

@@ -106 +106 @@
 const char * roar_codec2mime (const int    codec);
 
+int32_t roar_str2rate(const char * rate);
+int32_t roar_str2bits(const char * bits);
+int32_t roar_str2channels(const char * channels);
+
 const char * roar_streamstate2str(int streamstate);
 

libroar/stream.c

@@ -964 +964 @@
 }
 
+int32_t roar_str2rate(const char * rate) {
+ struct roar_audio_info info;
+ int ret;
+
+ if ( roar_profile2info(&info, rate) != -1 ) {
+  return info.rate;
+ }
+
+ ret = atoi(rate);
+
+ if ( ret == 0 && rate[0] != '0' ) {
+  return -1;
+ }
+
+ return ret;
+}
+
+int32_t roar_str2bits(const char * bits) {
+ struct roar_audio_info info;
+ int ret;
+
+ if ( roar_profile2info(&info, bits) != -1 ) {
+  return info.bits;
+ }
+
+ ret = atoi(bits);
+
+ if ( ret == 0 && bits[0] != '0' ) {
+  return -1;
+ }
+
+ return ret;
+}
+
+int32_t roar_str2channels(const char * channels) {
+ struct roar_audio_info info;
+ int ret;
+
+ if ( !strcasecmp(channels, "mono") ) {
+  return 1;
+ } else if ( !strcasecmp(channels, "stereo") ) {
+  return 2;
+ }
+
+ if ( roar_profile2info(&info, channels) != -1 ) {
+  return info.channels;
+ }
+
+ ret = atoi(channels);
+
+ if ( ret == 0 && channels[0] != '0' ) {
+  return -1;
+ }
+
+ return ret;
+}
+
+
 const char * roar_streamstate2str(int streamstate) {
  switch (streamstate) {

roarclients/roarbidir.c

@@ -44 +44 @@
 
 int main (int argc, char * argv[]) {
- int    rate     = 44100;
- int    bits     = 16;
- int    channels = 2;
+ int    rate     = ROAR_RATE_DEFAULT;
+ int    bits     = ROAR_BITS_DEFAULT;
+ int    channels = ROAR_CHANNELS_DEFAULT;
  int    codec    = ROAR_CODEC_DEFAULT;
  char * server   = NULL;
@@ -65 +65 @@
    server = argv[++i];
   } else if ( strcmp(k, "--rate") == 0 ) {
-   rate = atoi(argv[++i]);
+   rate = roar_str2rate(argv[++i]);
   } else if ( strcmp(k, "--bits") == 0 ) {
-   bits = atoi(argv[++i]);
+   bits = roar_str2bits(argv[++i]);
   } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) {
-   channels = atoi(argv[++i]);
+   channels = roar_str2channels(argv[++i]);
   } else if ( strcmp(k, "--codec") == 0 ) {
    codec = roar_str2codec(argv[++i]);

roarclients/roarcat.c

@@ -81 +81 @@
    name = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
-   rate = atoi(argv[++i]);
+   rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
-   bits = atoi(argv[++i]);
+   bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "-b") ) {
    bits = 8;
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
-   channels = atoi(argv[++i]);
+   channels = roar_str2channels(argv[++i]);
   } else if ( !strcmp(k, "-m") ) {
    channels = 1;

roarclients/roardtmf.c

@@ -137 +137 @@
    server = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") ) {
-   rate = atoi(argv[++i]);
+   rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") ) {
-   bits = atoi(argv[++i]);
+   bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "--codec") ) {
    codec = roar_str2codec(argv[++i]);

roarclients/roarmon.c

@@ -84 +84 @@
    server = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
-   rate = atoi(argv[++i]);
+   rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
-   bits = atoi(argv[++i]);
+   bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "-b") ) {
    bits = 8;
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
-   channels = atoi(argv[++i]);
+   channels = roar_str2channels(argv[++i]);
   } else if ( !strcmp(k, "-m") ) {
-   channels = 2;
+   channels = 1;
   } else if ( !strcmp(k, "--codec") ) {
    if ( (codec = roar_str2codec(argv[++i])) == -1 ) {

roarclients/roarmonhttp.c

@@ -251 +251 @@
    codec = roar_str2codec(argv[++i]);
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
-   rate = atoi(argv[++i]);
+   rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
-   bits = atoi(argv[++i]);
+   bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
-   channels = atoi(argv[++i]);
+   channels = roar_str2channels(argv[++i]);
   } else if ( !strcmp(k, "--rel-id") ) {
    rel_id = atoi(argv[++i]);
@@ -294 +294 @@
     return 1;
   } else if ( !strcmp(k, "channels") ) {
-   channels = atoi(v);
+   channels = roar_str2channels(v);
   } else if ( !strcmp(k, "rate") ) {
-   rate = atoi(v);
+   rate = roar_str2rate(v);
   } else if ( !strcmp(k, "bits") ) {
-   bits = atoi(v);
+   bits = roar_str2bits(v);
   } else if ( !strcmp(k, "rel-id") || !strcmp(k, "relid") ) {
    rel_id = atoi(v);

roarclients/roarphone.c

@@ -437 +437 @@
    g_conf.ioflush_interval = atoi(argv[++i]);
   } else if ( strcmp(k, "--rate") == 0 ) {
-   info.rate = atoi(argv[++i]);
+   info.rate = roar_str2rate(argv[++i]);
   } else if ( strcmp(k, "--bits") == 0 ) {
-   info.bits = atoi(argv[++i]);
+   info.bits = roar_str2bits(argv[++i]);
   } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) {
-   info.channels = atoi(argv[++i]);
+   info.channels = roar_str2channels(argv[++i]);
 
   } else if ( strcmp(k, "--afi-downmix") == 0 ) {