Changeset 904:51474cae0459 in roaraudio

Timestamp:

11/28/08 22:23:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_buffer_shift_out()

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/buffer.h (modified) (2 diffs)
• libroar/buffer.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+v. 0.1beta4 - ???
+        * added roar_buffer_shift_out()
+
 v. 0.1beta3 - Thu Nov 27 2008
         * fixed some includes, patch by janus

include/libroar/buffer.h

@@ -53 +53 @@
 };
 
-#define roar_buffer_next(a) roar_buffer_delete(*(a), (a));
+#define roar_buffer_next(a) roar_buffer_delete(*(a), (a))
 
 int roar_buffer_new      (struct roar_buffer ** buf, size_t len);
@@ -65 +65 @@
 
 int roar_buffer_set_offset (struct roar_buffer *  buf, size_t off);
+
+int roar_buffer_shift_out (struct roar_buffer ** buf, void * data, size_t * len);
 
 int roar_buffer_set_meta (struct roar_buffer *  buf, void   *  meta);

libroar/buffer.c

@@ -146 +146 @@
 }
 
+int roar_buffer_shift_out (struct roar_buffer ** buf, void * data, size_t * len) {
+ size_t todo, cl;
+ struct roar_buffer * cur;
+ void * cd;
+
+ if ( len == NULL || buf == NULL || data == NULL )
+  return -1;
+
+ if ( *buf == NULL )
+  return -1;
+
+ todo = *len;
+ cur  = *buf;
+
+ *len = 0;
+
+ while (todo) {
+  ROAR_DBG("roar_buffer_shift_out(*): todo=%u, cur=%p", (unsigned int) todo, cur);
+
+  if ( roar_buffer_get_len(cur, &cl) == -1 )
+   return -1;
+
+  if ( cl > todo ) {
+   if ( roar_buffer_get_data(cur, &cd) == -1 )
+    return -1;
+
+   cl = todo;
+
+   memcpy(data, cd, cl);
+   todo -= cl;
+   data += cl;
+   *len += cl;
+
+   if ( roar_buffer_set_offset(cur, cl) == -1 )
+    return -1;
+  } else {
+   if ( roar_buffer_get_data(cur, &cd) == -1 )
+    return -1;
+
+   memcpy(data, cd, cl);
+   todo -= cl;
+   data += cl;
+   *len += cl;
+
+   if ( roar_buffer_next(&cur) == -1 )
+    return -1;
+  }
+
+/*
+  if ( cur == NULL )
+   break;
+*/
+ }
+
+ *buf = cur;
+
+ return -1;
+}
+
 int roar_buffer_set_meta (struct roar_buffer * buf, void *  meta) {
  if ( buf == NULL )