Changeset 5305:80ba5004e4e7 in roaraudio for roard

Timestamp:

11/28/11 19:02:33 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some improvements with buffer usage (See: #126)

Location:

roard

Files:

• beep.c (modified) (1 diff)
• include/midi.h (modified) (1 diff)
• midi.c (modified) (6 diffs)
• raw.c (modified) (2 diffs)

roard/beep.c

@@ -25 +25 @@
 
 #include "roard.h"
+
+// TODO: FIXME: can all this VIO stuff be replaced by one call to stream_add_buffer()?
 
 // TODO: FIXME: move them out of here into libroar:

roard/include/midi.h

@@ -151 +151 @@
 
 int midi_new_bufmes    (struct roar_buffer ** buf, struct midi_message ** mes);
-int midi_add_buf       (int id, struct roar_buffer * buf);
+int midi_add_buf       (int id, struct roar_buffer ** buf);
 
 // bridges:

roard/midi.c

@@ -347 +347 @@
      roar_buffer_free(buf);
     } else {
-     midi_add_buf(id, buf); // FIXME: don't we need error handling here?
+     midi_add_buf(id, &buf); // FIXME: don't we need error handling here?
     }
 
@@ -379 +379 @@
    roar_buffer_free(buf);
   } else {
-   midi_add_buf(id, buf); // FIXME: don't we need error handling here?
+   midi_add_buf(id, &buf); // FIXME: don't we need error handling here?
    cachepos = 0;
   }
@@ -683 +683 @@
 }
 
-int midi_add_buf       (int id, struct roar_buffer * buf) {
+int midi_add_buf       (int id, struct roar_buffer ** buf) {
 #ifdef DEBUG
  struct midi_message * mes;
@@ -689 +689 @@
 #endif
 
- if ( id == -1 || buf == NULL )
+ if ( id == -1 || buf == NULL || *buf == NULL )
   return -1;
 
 #ifdef DEBUG
- if ( roar_buffer_get_data(buf, &bufdata) == -1 )
+ if ( roar_buffer_get_data(*buf, &bufdata) == -1 )
   return -1;
 
@@ -706 +706 @@
 
  if ( g_midi_mess.buf == NULL ) {
-  g_midi_mess.buf = buf;
+  g_midi_mess.buf = *buf;
  } else {
-  if ( roar_buffer_moveinto(g_midi_mess.buf, &buf) == -1 ) {
+  if ( roar_buffer_moveinto(g_midi_mess.buf, buf) == -1 ) {
    ROAR_DBG("midi_add_buf(*) = -1");
    return -1;
@@ -819 +819 @@
    mes->type = MIDI_TYPE_CLOCK_TICK;
 
-   if ( midi_add_buf(g_midi_clock.stream, buf) == -1 ) {
+   if ( midi_add_buf(g_midi_clock.stream, &buf) == -1 ) {
     ROAR_ERR("midi_clock_tick(void): Can not add Clock-Tick-Message");
     roar_buffer_free(buf);

roard/raw.c

@@ -45 +45 @@
   return -1;
 
+ // TODO: do we really need a buffer object here? wouldn't space on stack be ok?
  if ( roar_buffer_new_data(&buf, RAW_READ_LEN, &data) == -1 )
   return -1;
@@ -56 +57 @@
 
  if ( stream_vio_write(s->pos_rel_id, data, len) != len ) {
-  // we are that hard here as this is needed to ensure data integrety
+  // we are hard here as this is needed to ensure data integrety
   streams_delete(s->pos_rel_id);
  }