Changeset 4883:c56aedd9d0cb in roaraudio
- Timestamp:
- 04/26/11 21:39:10 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r4882 r4883 2 2 * Added new error codes. 3 3 * Improved listing of audio profiles. 4 * Added functions to access symbolic names for audio info parameters (Closes: #51) 4 5 5 6 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST -
include/libroar/stream.h
r4708 r4883 106 106 const char * roar_codec2mime (const int codec); 107 107 108 int32_t roar_str2rate(const char * rate); 109 int32_t roar_str2bits(const char * bits); 110 int32_t roar_str2channels(const char * channels); 111 108 112 const char * roar_streamstate2str(int streamstate); 109 113 -
libroar/stream.c
r4796 r4883 964 964 } 965 965 966 int32_t roar_str2rate(const char * rate) { 967 struct roar_audio_info info; 968 int ret; 969 970 if ( roar_profile2info(&info, rate) != -1 ) { 971 return info.rate; 972 } 973 974 ret = atoi(rate); 975 976 if ( ret == 0 && rate[0] != '0' ) { 977 return -1; 978 } 979 980 return ret; 981 } 982 983 int32_t roar_str2bits(const char * bits) { 984 struct roar_audio_info info; 985 int ret; 986 987 if ( roar_profile2info(&info, bits) != -1 ) { 988 return info.bits; 989 } 990 991 ret = atoi(bits); 992 993 if ( ret == 0 && bits[0] != '0' ) { 994 return -1; 995 } 996 997 return ret; 998 } 999 1000 int32_t roar_str2channels(const char * channels) { 1001 struct roar_audio_info info; 1002 int ret; 1003 1004 if ( !strcasecmp(channels, "mono") ) { 1005 return 1; 1006 } else if ( !strcasecmp(channels, "stereo") ) { 1007 return 2; 1008 } 1009 1010 if ( roar_profile2info(&info, channels) != -1 ) { 1011 return info.channels; 1012 } 1013 1014 ret = atoi(channels); 1015 1016 if ( ret == 0 && channels[0] != '0' ) { 1017 return -1; 1018 } 1019 1020 return ret; 1021 } 1022 1023 966 1024 const char * roar_streamstate2str(int streamstate) { 967 1025 switch (streamstate) { -
roarclients/roarbidir.c
r4708 r4883 44 44 45 45 int main (int argc, char * argv[]) { 46 int rate = 44100;47 int bits = 16;48 int channels = 2;46 int rate = ROAR_RATE_DEFAULT; 47 int bits = ROAR_BITS_DEFAULT; 48 int channels = ROAR_CHANNELS_DEFAULT; 49 49 int codec = ROAR_CODEC_DEFAULT; 50 50 char * server = NULL; … … 65 65 server = argv[++i]; 66 66 } else if ( strcmp(k, "--rate") == 0 ) { 67 rate = atoi(argv[++i]);67 rate = roar_str2rate(argv[++i]); 68 68 } else if ( strcmp(k, "--bits") == 0 ) { 69 bits = atoi(argv[++i]);69 bits = roar_str2bits(argv[++i]); 70 70 } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) { 71 channels = atoi(argv[++i]);71 channels = roar_str2channels(argv[++i]); 72 72 } else if ( strcmp(k, "--codec") == 0 ) { 73 73 codec = roar_str2codec(argv[++i]); -
roarclients/roarcat.c
r4708 r4883 81 81 name = argv[++i]; 82 82 } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) { 83 rate = atoi(argv[++i]);83 rate = roar_str2rate(argv[++i]); 84 84 } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) { 85 bits = atoi(argv[++i]);85 bits = roar_str2bits(argv[++i]); 86 86 } else if ( !strcmp(k, "-b") ) { 87 87 bits = 8; 88 88 } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) { 89 channels = atoi(argv[++i]);89 channels = roar_str2channels(argv[++i]); 90 90 } else if ( !strcmp(k, "-m") ) { 91 91 channels = 1; -
roarclients/roardtmf.c
r4708 r4883 137 137 server = argv[++i]; 138 138 } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") ) { 139 rate = atoi(argv[++i]);139 rate = roar_str2rate(argv[++i]); 140 140 } else if ( !strcmp(k, "--bits") ) { 141 bits = atoi(argv[++i]);141 bits = roar_str2bits(argv[++i]); 142 142 } else if ( !strcmp(k, "--codec") ) { 143 143 codec = roar_str2codec(argv[++i]); -
roarclients/roarmon.c
r4817 r4883 84 84 server = argv[++i]; 85 85 } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) { 86 rate = atoi(argv[++i]);86 rate = roar_str2rate(argv[++i]); 87 87 } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) { 88 bits = atoi(argv[++i]);88 bits = roar_str2bits(argv[++i]); 89 89 } else if ( !strcmp(k, "-b") ) { 90 90 bits = 8; 91 91 } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) { 92 channels = atoi(argv[++i]);92 channels = roar_str2channels(argv[++i]); 93 93 } else if ( !strcmp(k, "-m") ) { 94 channels = 2;94 channels = 1; 95 95 } else if ( !strcmp(k, "--codec") ) { 96 96 if ( (codec = roar_str2codec(argv[++i])) == -1 ) { -
roarclients/roarmonhttp.c
r4708 r4883 251 251 codec = roar_str2codec(argv[++i]); 252 252 } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) { 253 rate = atoi(argv[++i]);253 rate = roar_str2rate(argv[++i]); 254 254 } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) { 255 bits = atoi(argv[++i]);255 bits = roar_str2bits(argv[++i]); 256 256 } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) { 257 channels = atoi(argv[++i]);257 channels = roar_str2channels(argv[++i]); 258 258 } else if ( !strcmp(k, "--rel-id") ) { 259 259 rel_id = atoi(argv[++i]); … … 294 294 return 1; 295 295 } else if ( !strcmp(k, "channels") ) { 296 channels = atoi(v);296 channels = roar_str2channels(v); 297 297 } else if ( !strcmp(k, "rate") ) { 298 rate = atoi(v);298 rate = roar_str2rate(v); 299 299 } else if ( !strcmp(k, "bits") ) { 300 bits = atoi(v);300 bits = roar_str2bits(v); 301 301 } else if ( !strcmp(k, "rel-id") || !strcmp(k, "relid") ) { 302 302 rel_id = atoi(v); -
roarclients/roarphone.c
r4708 r4883 437 437 g_conf.ioflush_interval = atoi(argv[++i]); 438 438 } else if ( strcmp(k, "--rate") == 0 ) { 439 info.rate = atoi(argv[++i]);439 info.rate = roar_str2rate(argv[++i]); 440 440 } else if ( strcmp(k, "--bits") == 0 ) { 441 info.bits = atoi(argv[++i]);441 info.bits = roar_str2bits(argv[++i]); 442 442 } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) { 443 info.channels = atoi(argv[++i]);443 info.channels = roar_str2channels(argv[++i]); 444 444 445 445 } else if ( strcmp(k, "--afi-downmix") == 0 ) {
Note: See TracChangeset
for help on using the changeset viewer.