Changeset 4521:4277b6a0c8a1 in roaraudio for roard/beep.c

Timestamp:

10/16/10 17:09:23 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed a lot compiler warnings

File:

• roard/beep.c (modified) (4 diffs)

roard/beep.c

@@ -28 +28 @@
 // TODO: FIXME: move them out of here into libroar:
 static ssize_t beep_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
+ struct roar_buffer * rbuf;
+
  ROAR_DBG("beep_read(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
 
@@ -33 +35 @@
   return 0;
 
- if ( roar_buffer_shift_out(&(vio->inst), buf, &count) == -1 )
+ rbuf = vio->inst;
+
+ if ( roar_buffer_shift_out(&rbuf, buf, &count) == -1 )
   return -1;
+
+ vio->inst = rbuf;
 
  return count;
@@ -67 +73 @@
  size_t mod     = info->rate / beep->freq;
  char                        * data;
+ void                        * bufdata;
  char   val;
  size_t pos;
@@ -73 +80 @@
  ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = ?", beep, info);
 
- if ( roar_buffer_new_data(&buf, samples, &data) == -1 ) {
+ if ( roar_buffer_new_data(&buf, samples, &bufdata) == -1 ) {
   ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = NULL", beep, info);
   return NULL;
  }
+
+ data = (char*)bufdata;
 
  for (pos = 0; pos < frames; pos++) {