Changeset 1215:5cf113ac883c in roaraudio

Timestamp:

02/19/09 15:32:56 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to buffer system for non alleced buffers

Files:

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

ChangeLog

@@ -10 +10 @@
         * set fragment size for OSS driver
         * fixed some minor bugs
+        * changed buffer interface a bit to support non buffer alloced buffers
 
 v. 0.2beta0 - Wed Feb 04 2009

include/libroar/buffer.h

@@ -38 +38 @@
 #include <roaraudio.h>
 
+#define ROAR_BUFFER_FLAG_NONE      0
+#define ROAR_BUFFER_FLAG_NOFREE    1
+
+#define ROAR_BUFFER_SET            0
+#define ROAR_BUFFER_RESET          1
+
 struct roar_buffer {
  size_t               len;
  size_t               user_len;
+ int                  flags;
  void               * data;
  void               * user_data;
@@ -56 +63 @@
 
 int roar_buffer_new      (struct roar_buffer ** buf, size_t len);
+int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data); // no internal malloc
 int roar_buffer_free     (struct roar_buffer *  buf);
 int roar_buffer_delete   (struct roar_buffer *  buf, struct roar_buffer ** next);
@@ -74 +82 @@
 int roar_buffer_get_len  (struct roar_buffer *  buf, size_t *  len);
 
+int roar_buffer_set_flag (struct roar_buffer *  buf, int flag, int reset);
+int roar_buffer_get_flag (struct roar_buffer *  buf, int flag);
+
 int roar_buffer_duplicate (struct roar_buffer *  buf, struct roar_buffer ** copy);
 

libroar/buffer.c

@@ -36 +36 @@
 
 int roar_buffer_new      (struct roar_buffer ** buf, size_t len) {
+ void * data;
+
+ if ((data = malloc(len)) == NULL) {
+  return -1;
+ }
+
+ if ( roar_buffer_new_no_ma(buf, len, data) == -1 ) {
+  free(data);
+  return -1;
+ }
+
+ if ( roar_buffer_set_flag(*buf, ROAR_BUFFER_FLAG_NOFREE, ROAR_BUFFER_RESET) == -1 ) {
+  roar_buffer_free(*buf);
+  free(data);
+  return -1;
+ }
+
+ return 0;
+}
+
+int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data) { // no internal malloc
  struct roar_buffer * new;
 
  ROAR_DBG("buffer_new(buf=%p, len=%i) = ?", buf, len);
+
+ if ( buf == NULL || data == NULL )
+  return -1;
 
  if ((new = malloc(sizeof(struct roar_buffer))) == NULL) {
@@ -45 +69 @@
  }
 
- if ((new->data = malloc(len)) == NULL) {
-  free(new);
-  *buf = NULL;
-  return -1;
- }
+ new->data      = data;
+
+ new->flags     = ROAR_BUFFER_FLAG_NONE|ROAR_BUFFER_FLAG_NOFREE;
 
  new->user_data = new->data;
@@ -76 +98 @@
  }
 
- free(buf->data);
+ if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 )
+  free(buf->data);
+
  free(buf);
 
@@ -245 +269 @@
 }
 
+int roar_buffer_set_flag (struct roar_buffer *  buf, int flag, int reset) {
+ if ( buf == NULL )
+  return -1;
+
+ buf->flags |= flag;
+
+ if ( reset )
+  buf->flags -= flag;
+
+ return 0;
+}
+
+int roar_buffer_get_flag (struct roar_buffer *  buf, int flag) {
+ if ( buf == NULL )
+  return -1;
+
+ return buf->flags & flag;
+}
+
 int roar_buffer_duplicate (struct roar_buffer *  buf, struct roar_buffer ** copy) {
  struct roar_buffer *  cur = buf;