Changeset 5179:f9480d9e89e3 in roaraudio for roarclients/roarvumeter.c

Timestamp:

10/22/11 13:37:43 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

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

File:

• roarclients/roarvumeter.c (modified) (3 diffs)

roarclients/roarvumeter.c

@@ -137 +137 @@
 
 int vumeter (struct roar_vio_calls * vio, int samples, int bits, int channels, int mode, struct roardsp_filterchain * fc) {
- void * buf = malloc((samples*bits*channels)/8);
-
- if ( !buf )
+ void * buf = roar_mm_malloc((samples*bits*channels)/8);
+
+ if ( buf == NULL )
   return -1;
 
@@ -145 +145 @@
   if ( channels == 2 ) {
    vumeter16bit2ch(vio, samples, (int16_t *) buf, mode, fc);
-   free(buf);
+   roar_mm_free(buf);
    return 0;
   } else {
-   free(buf);
+   roar_mm_free(buf);
    return -1;
   }
  } else {
-  free(buf);
+  roar_mm_free(buf);
   return -1;
  }
@@ -180 +180 @@
    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, "--samples") == 0 ) {
    samples = atoi(argv[++i]);