Changeset 5298:a0d70da17a74 in roaraudio

Timestamp:

11/25/11 03:14:22 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

converted roar_buffer_next() to a function, added roar_buffer_moveinto() (See: #126)

Files:

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

include/libroar/buffer.h

@@ -61 +61 @@
 };
 
-#define roar_buffer_next(a)    roar_buffer_delete(*(a), (a))
-
 #define roar_buffer_new(a,len) roar_buffer_new_data((a), (len), NULL)
 
@@ -69 +67 @@
 int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data) _LIBROAR_BUFFER_STDATTRS; // no internal malloc
 int roar_buffer_delete   (struct roar_buffer *  buf, struct roar_buffer ** next) _LIBROAR_BUFFER_STDATTRS;
+int roar_buffer_next     (struct roar_buffer ** buf) _LIBROAR_BUFFER_STDATTRS;
 int roar_buffer_add      (struct roar_buffer *  buf, struct roar_buffer *  next) _LIBROAR_BUFFER_STDATTRS;
+int roar_buffer_moveinto (struct roar_buffer *  buf, struct roar_buffer *  next) _LIBROAR_BUFFER_STDATTRS;
 
 int roar_buffer_ref      (struct roar_buffer *  buf) _LIBROAR_ATTR_NONNULL_ALL;

libroar/buffer.c

@@ -259 +259 @@
 }
 
+int roar_buffer_next     (struct roar_buffer ** buf) {
+ return roar_buffer_delete(*buf, buf);
+}
+
 int roar_buffer_add      (struct roar_buffer * buf, struct roar_buffer *  next) {
+ return roar_buffer_moveinto(buf, next);
+}
+
+int roar_buffer_moveinto (struct roar_buffer * buf, struct roar_buffer *  next) {
  unsigned int deep = 0;