Changeset 5302:4d77c9526beb in roaraudio for roard

Timestamp:

11/26/11 15:49:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_buffer_foreach() (See: #126)

Location:

roard

Files:

• midi.c (modified) (6 diffs)
• streams.c (modified) (2 diffs)

roard/midi.c

@@ -583 +583 @@
  send_clock = streams_get_flag(id, ROAR_FLAG_SYNC);
 
- while (buf != NULL) {
+ roar_buffer_foreach(buf) {
   if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
    return -1;
@@ -638 +638 @@
    }
   }
-
-  if ( roar_buffer_get_next(buf, &buf) == -1 )
-   buf = NULL;
  }
 
@@ -653 +650 @@
  void                      * bufdata;
 
- while (buf != NULL) {
+ roar_buffer_foreach(buf) {
   if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
    return -1;
@@ -662 +659 @@
   if ( ssynth_eval_message(mes) == -1 )
    return -1;
-
-  if ( roar_buffer_get_next(buf, &buf) == -1 )
-   buf = NULL;
  }
 
@@ -1017 +1011 @@
  ROAR_DBG("midi_cb_readbuf(void) = ?");
 
- while (buf != NULL) {
+ roar_buffer_foreach(buf) {
   ROAR_DBG("midi_cb_readbuf(void): buf=%p", buf);
 
@@ -1038 +1032 @@
     break;
   }
-
-  if ( roar_buffer_get_next(buf, &buf) == -1 )
-   buf = NULL;
  }
 

roard/streams.c

@@ -2118 +2118 @@
  ROAR_DBG("stream_prethru_send(dst=%i, src=%i): prethru buffer at %p", dst, src, bufbuf);
 
- while (bufbuf != NULL) {
+ roar_buffer_foreach(bufbuf) {
   ROAR_DBG("stream_prethru_send(dst=%i, src=%i): looping with buffer at %p", dst, src, bufbuf);
 
@@ -2128 +2128 @@
 
   if ( stream_vio_s_write(dst_ss, bufdata, buflen) != buflen )
-   return -1;
-
-  if ( roar_buffer_get_next(bufbuf, &bufbuf) == -1 )
    return -1;
  }