Changeset 4624:7cdf88681b49 in roaraudio for libroar/buffer.c

Timestamp:

11/27/10 00:32:39 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updates for ringbuffer

File:

• libroar/buffer.c (modified) (3 diffs)

libroar/buffer.c

@@ -235 +235 @@
  *buf = NULL;
 
- // currently we are limited to free running mode
- if ( !free_running )
-  return -1;
-
  if ( roar_buffer_new(&n, len) == -1 )
   return -1;
@@ -576 +572 @@
 
 int roar_buffer_ring_write (struct roar_buffer *  buf, void * data, size_t * len) {
+ struct roar_buffer_ring * ring;
+ size_t havelen;
+ size_t done;
+ size_t tmp;
+
  if ( buf == NULL || len == NULL )
   return -1;
@@ -611 +612 @@
   }
  } else {
+  ring = &(buf->meta.ring);
+  done = 0;
+
+  ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p): write_pos=%u, read_pos=%u, user_len=%u", buf, data, len, (unsigned int)ring->write_pos, (unsigned int)ring->read_pos, (unsigned int)buf->user_len);
+
+  if ( ring->write_pos >= ring->read_pos ) {
+   havelen = buf->user_len - ring->write_pos;
+
+   if ( ring->read_pos == 0 )
+    havelen--;
+
+   if ( havelen > *len )
+    havelen = *len;
+
+   memcpy(buf->user_data+ring->write_pos, data, havelen);
+
+   done += havelen;
+   ring->write_pos += havelen;
+
+   if ( ring->write_pos == buf->user_len )
+    ring->write_pos = 0;
+
+   if ( *len > done && ring->read_pos != 0 ) {
+    tmp = *len - done;
+    if ( roar_buffer_ring_write(buf, data+done, &tmp) == 0 ) {
+     done += tmp;
+    }
+   }
+
+   *len = done;
+   return 0;
+  } else {
+   // test for buffer-is-full:
+   if ( (ring->write_pos + 1) == ring->read_pos ) {
+    *len = 0;
+    return 0;
+   }
+
+   havelen = ring->read_pos - ring->write_pos - 1;
+
+   if ( havelen > *len )
+    havelen = *len;
+
+   memcpy(buf->user_data+ring->write_pos, data, havelen);
+
+   *len = havelen;
+   return 0;
+  }
+
   return -1;
  }