Changeset 1866:ebdddc368270 in roaraudio

Timestamp:

05/23/09 16:12:26 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved adding of buffer out of parser

Location:

roard

Files:

• include/midi.h (modified) (1 diff)
• midi.c (modified) (3 diffs)

roard/include/midi.h

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

roard/midi.c

@@ -183 +183 @@
    if ( *data & 0x80 ) {
     if ( buf != NULL ) {
-     if ( g_midi_mess.buf == NULL ) {
-      g_midi_mess.buf = buf;
-     } else {
-      roar_buffer_add(g_midi_mess.buf, buf);
-     }
+     midi_add_buf(id, buf);
      buf = NULL;
     }
@@ -246 +242 @@
    buf = NULL;
   } else if ( buf != NULL ) {
-   if ( g_midi_mess.buf == NULL ) {
-    g_midi_mess.buf = buf;
-   } else {
-    roar_buffer_add(g_midi_mess.buf, buf);
-   }
-
+   midi_add_buf(id, buf);
    buf = NULL;
   }
@@ -281 +272 @@
 
  (*mes)->type = MIDI_TYPE_NONE;
+
+ return 0;
+}
+
+int midi_add_buf       (int id, struct roar_buffer * buf) {
+ if ( id == -1 || buf == NULL )
+  return -1;
+
+ if ( g_midi_mess.buf == NULL ) {
+  g_midi_mess.buf = buf;
+ } else {
+  roar_buffer_add(g_midi_mess.buf, buf);
+ }
 
  return 0;