Changeset 2918:a5612107d49c in roaraudio

Timestamp:

10/16/09 17:08:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ported to VIO, seems to fix the bug of wrong calced values

File:

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

roarclients/roarvumeter.c

@@ -49 +49 @@
 }
 
-int vumeter16bit2ch (int fh, int samples, int16_t * buf, int mode) {
+int vumeter16bit2ch (struct roar_vio_calls * vio, int samples, int16_t * buf, int mode) {
  int i;
  int samples_half = samples/2;
@@ -58 +58 @@
  fflush(stdout);
 
- while (read(fh, buf, samples * 2)) {
+ while (roar_vio_read(vio, buf, samples * 2) > 0) {
   suml = sumr = 0;
 
@@ -83 +83 @@
 }
 
-int vumeter (int fh, int samples, int bits, int channels, int mode) {
+int vumeter (struct roar_vio_calls * vio, int samples, int bits, int channels, int mode) {
  void * buf = malloc(samples*bits*2);
 
@@ -91 +91 @@
  if ( bits == 16 ) {
   if ( channels == 2 ) {
-   vumeter16bit2ch(fh, samples, (int16_t *) buf, mode);
+   vumeter16bit2ch(vio, samples, (int16_t *) buf, mode);
    free(buf);
    return 0;
@@ -110 +110 @@
  char * server   = NULL;
  char * k;
- int    fh;
+ struct roar_vio_calls stream, re;
  int    i;
  int    mode = MODE_PC;
@@ -139 +139 @@
  }
 
- if ( (fh = roar_simple_monitor(rate, channels, bits, codec, server, "roarvumeter")) == -1 ) {
-  fprintf(stderr, "Error: can not start playback\n");
+ if ( roar_vio_simple_stream(&stream, rate, channels, bits, codec, server, ROAR_DIR_MONITOR, "roarvumeter") == -1) {
+  fprintf(stderr, "Error: can not start monetoring\n");
   return 1;
  }
 
- vumeter(fh, samples*channels, bits, channels, mode);
+ if ( roar_vio_open_re(&re, &stream) == -1 ) {
+  roar_vio_close(&stream);
+  fprintf(stderr, "Error: can not open RE VIO layer\n");
+  return 1;
+ }
+
+ vumeter(&re, samples*channels, bits, channels, mode);
 
  printf("\n"); // if the reach this then roard has quited and we should print a newline
 
- roar_simple_close(fh);
+ roar_vio_close(&re);
 
  return 0;