some leftover work

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@43 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce

1 files changed, 9 insertions, 9 deletions

diff --git a/src/bufferq.c b/src/bufferq.c
index bafcaa1..46f9bbc 100644
--- a/src/bufferq.c
+++ b/src/bufferq.c
@@ -10,13 +10,11 @@
 
 #define SA_BUFFERQ_ITEM_CONCAT_DATA(x) ((void*) ((uint8_t*) (x) + SA_ALIGN(sizeof(sa_bufferq_item_t))))
 
-int sa_bufferq_init(sa_bufferq_t *q, unsigned nchannels, size_t sample_size) {
+int sa_bufferq_init(sa_bufferq_t *q, unsigned nchannels) {
     sa_assert(q);
-    sa_assert(sample_size > 0);
     sa_assert(nchannels > 0);
 
     memset(q, 0, sizeof(*q));
-    q->sample_size = sample_size;
     q->nchannels = nchannels;
 
     if (!(q->items = sa_new0(sa_bufferq_item_t*, nchannels)))
@@ -175,7 +173,7 @@ int sa_bufferq_push(sa_bufferq_t *q, unsigned channel, const void *data, size_t
 }
 
 void sa_bufferq_get(sa_bufferq_t *q, void *i[], size_t *bytes) {
-    int first = 1;
+    sa_bool_t first = TRUE;
     unsigned u;
     sa_assert(q);
 
@@ -193,7 +191,7 @@ void sa_bufferq_get(sa_bufferq_t *q, void *i[], size_t *bytes) {
 
                 if (first) {
                     *bytes = l;
-                    first = 0;
+                    first = FALSE;
                 } else
                     *bytes = l < *bytes ? l : *bytes;
             } else {
@@ -205,7 +203,7 @@ void sa_bufferq_get(sa_bufferq_t *q, void *i[], size_t *bytes) {
 
                 if (first) {
                     *bytes = l;
-                    first = 0;
+                    first = FALSE;
                 } else
                     *bytes = l < *bytes ? l : *bytes;
             }
@@ -215,7 +213,6 @@ void sa_bufferq_get(sa_bufferq_t *q, void *i[], size_t *bytes) {
     }
 }
 
-
 void sa_bufferq_drop(sa_bufferq_t *q, int64_t bytes) {
     unsigned u;
 
@@ -244,19 +241,22 @@ void sa_bufferq_drop(sa_bufferq_t *q, int64_t bytes) {
 
 int sa_bufferq_realloc(sa_bufferq_t *q) {
     unsigned u;
-    int fail = 0;
+    sa_bool_t fail = FALSE;
     sa_assert(q);
 
     for (u = 0; u < q->nchannels; u++) {
         sa_bufferq_item_t *i;
 
+        /* FIXME: This goes through the list linearly. We might need
+         * to optimize this a little */
+
         for (i = q->items[u]; i; i = i->bufferq_next) {
 
             if (i->type != SA_BUFFERQ_ITEM_STATIC)
                 continue;
 
             if (!bufferq_item_make_writable(i)) {
-                fail = 1;
+                fail = TRUE;
 
                 /* Hmm, we couldn't allocate memory, but we can't
                  * return without doing anything, hence let's at least