Changeset 4521:4277b6a0c8a1 in roaraudio for roard/midi.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/midi.c (modified) (10 diffs)

roard/midi.c

@@ -136 +136 @@
  struct roar_stream_server *  ss;
  struct roar_buffer        *   b;
- char                      * buf;
+ void                      * buf;
  ssize_t                     len;
 
@@ -157 +157 @@
  }
 
- if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, (void**)&buf) == -1 ) {
+ if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, &buf) == -1 ) {
   ROAR_ERR("midi_check_stream(*): Can not alloc buffer space!");
   ROAR_DBG("midi_check_stream(*) = -1");
@@ -213 +213 @@
 
 int midi_conv_midi2mes (int id) {
+ void          * bufdata;
  unsigned char * data;
  struct roar_stream        *   s;
@@ -229 +230 @@
 
  while (ss->buffer != NULL && alive) {
-  if ( roar_buffer_get_data(ss->buffer, (void**)&data) == -1 ) {
+  if ( roar_buffer_get_data(ss->buffer, &bufdata) == -1 ) {
    alive = 0;
    continue;
   }
+
+  data = bufdata;
 
   if ( roar_buffer_get_len(ss->buffer, &have) == -1 ) {
@@ -375 +378 @@
  struct roar_buffer        * buf = g_midi_mess.buf;
  struct midi_message       * mes = NULL;
+ void                      * bufdata;
  unsigned char               data[3];
  unsigned char             * d;
@@ -390 +394 @@
 
  while (buf != NULL) {
-  if ( roar_buffer_get_data(buf, (void**)&mes) == -1 ) {
+  if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
    return -1;
   }
+
+  mes = bufdata;
 
   if (mes->type == MIDI_TYPE_CLOCK_TICK || mes->type == MIDI_TYPE_CLOCK_START || mes->type == MIDI_TYPE_CLOCK_STOP ) {
@@ -455 +461 @@
  struct roar_buffer        * buf = g_midi_mess.buf;
  struct midi_message       * mes = NULL;
+ void                      * bufdata;
 
  while (buf != NULL) {
-  if ( roar_buffer_get_data(buf, (void**)&mes) == -1 ) {
+  if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
    return -1;
   }
+
+  mes = bufdata;
 
   if ( ssynth_eval_message(mes) == -1 )
@@ -492 +501 @@
 int midi_add_buf       (int id, struct roar_buffer * buf) {
  struct midi_message * mes;
+ void * bufdata;
 
  if ( id == -1 || buf == NULL )
   return -1;
 
- if ( roar_buffer_get_data(buf, (void**)&mes) == -1 )
-  return -1;
+ if ( roar_buffer_get_data(buf, &bufdata) == -1 )
+  return -1;
+
+ mes = bufdata;
 
  ROAR_DBG("midi_add_buf(id=%i, buf=%p) = ?", id, buf);
@@ -803 +815 @@
  struct roar_buffer        * buf = g_midi_mess.buf;
  struct midi_message       * mes = NULL;
+ void                      * bufdata;
 
  ROAR_DBG("midi_cb_readbuf(void) = ?");
@@ -809 +822 @@
   ROAR_DBG("midi_cb_readbuf(void): buf=%p", buf);
 
-  if ( roar_buffer_get_data(buf, (void**)&mes) == -1 ) {
+  if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
    return -1;
   }
+
+  mes = bufdata;
 
   switch (mes->type) {