Changeset 5179:f9480d9e89e3 in roaraudio


Ignore:
Timestamp:
10/22/11 13:37:43 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

make use of roar_str2*() and some other minor changes

Location:
roarclients
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • roarclients/roarfilt.c

    r5178 r5179  
    170170   server = argv[++i]; 
    171171  } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 || strcmp(k, "-r") == 0 ) { 
    172    rate = atoi(argv[++i]); 
     172   rate = roar_str2rate(argv[++i]); 
    173173  } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) { 
    174    bits = atoi(argv[++i]); 
     174   bits = roar_str2bits(argv[++i]); 
    175175  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) { 
    176    channels = atoi(argv[++i]); 
     176   channels = roar_str2channels(argv[++i]); 
    177177  } else if ( strcmp(k, "-b") == 0 ) { 
    178178   bits = 8; 
  • roarclients/roarinterconnect.c

    r5109 r5179  
    278278   type = parse_type(argv[++i]); 
    279279  } else if ( strcmp(k, "--rate") == 0 ) { 
    280    rate = atoi(argv[++i]); 
     280   rate = roar_str2rate(argv[++i]); 
    281281  } else if ( strcmp(k, "--bits") == 0 ) { 
    282    bits = atoi(argv[++i]); 
     282   bits = roar_str2bits(argv[++i]); 
    283283  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) { 
    284    channels = atoi(argv[++i]); 
     284   channels = roar_str2channels(argv[++i]); 
    285285  } else if ( strcmp(k, "--codec") == 0 ) { 
    286286   codec = roar_str2codec(argv[++i]); 
  • roarclients/roarradio.c

    r5109 r5179  
    7575   server = argv[++i]; 
    7676  } else if ( strcmp(k, "--rate") == 0 ) { 
    77    rate = atoi(argv[++i]); 
     77   rate = roar_str2rate(argv[++i]); 
    7878  } else if ( strcmp(k, "--bits") == 0 ) { 
    79    bits = atoi(argv[++i]); 
     79   bits = roar_str2bits(argv[++i]); 
    8080  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) { 
    81    channels = atoi(argv[++i]); 
     81   channels = roar_str2channels(argv[++i]); 
    8282  } else if ( strcmp(k, "--codec") == 0 ) { 
    8383   codec = roar_str2codec(argv[++i]); 
  • roarclients/roarshout.c

    r4885 r5179  
    119119   server = argv[++i]; 
    120120  } else if ( strcmp(k, "--rate") == 0 ) { 
    121    rate = atoi(argv[++i]); 
     121   rate = roar_str2rate(argv[++i]); 
    122122  } else if ( strcmp(k, "--bits") == 0 ) { 
    123    bits = atoi(argv[++i]); 
     123   bits = roar_str2bits(argv[++i]); 
    124124  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) { 
    125    channels = atoi(argv[++i]); 
     125   channels = roar_str2channels(argv[++i]); 
    126126  } else if ( strcmp(k, "--codec") == 0 ) { 
    127127   codec = roar_str2codec(argv[++i]); 
  • roarclients/roarvumeter.c

    r4708 r5179  
    137137 
    138138int vumeter (struct roar_vio_calls * vio, int samples, int bits, int channels, int mode, struct roardsp_filterchain * fc) { 
    139  void * buf = malloc((samples*bits*channels)/8); 
    140  
    141  if ( !buf ) 
     139 void * buf = roar_mm_malloc((samples*bits*channels)/8); 
     140 
     141 if ( buf == NULL ) 
    142142  return -1; 
    143143 
     
    145145  if ( channels == 2 ) { 
    146146   vumeter16bit2ch(vio, samples, (int16_t *) buf, mode, fc); 
    147    free(buf); 
     147   roar_mm_free(buf); 
    148148   return 0; 
    149149  } else { 
    150    free(buf); 
     150   roar_mm_free(buf); 
    151151   return -1; 
    152152  } 
    153153 } else { 
    154   free(buf); 
     154  roar_mm_free(buf); 
    155155  return -1; 
    156156 } 
     
    180180   server = argv[++i]; 
    181181  } else if ( strcmp(k, "--rate") == 0 ) { 
    182    rate = atoi(argv[++i]); 
     182   rate = roar_str2rate(argv[++i]); 
    183183  } else if ( strcmp(k, "--bits") == 0 ) { 
    184    bits = atoi(argv[++i]); 
     184   bits = roar_str2bits(argv[++i]); 
    185185  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0) { 
    186    channels = atoi(argv[++i]); 
     186   channels = roar_str2channels(argv[++i]); 
    187187  } else if ( strcmp(k, "--samples") == 0 ) { 
    188188   samples = atoi(argv[++i]); 
Note: See TracChangeset for help on using the changeset viewer.