]> git.tuebingen.mpg.de Git - paraslash.git/blobdiff - buffer_tree.c
Link buffer tree code also to audiod.
[paraslash.git] / buffer_tree.c
index 9a59fff9c0419ac95ea4f71c62ef87e108973dbb..084827e3d34c0952588f1a751a20ffe32eb28467 100644 (file)
@@ -4,7 +4,7 @@
 #include "para.h"
 #include "list.h"
 #include "string.h"
-//#include "buffer_tree.h"
+#include "buffer_tree.h"
 
 
 struct btr_buffer {
@@ -44,8 +44,6 @@ struct btr_node {
 #define FOR_EACH_BUFFER_REF_SAFE(_br, _tmp, _btrn) \
        list_for_each_entry_safe((_br), (_tmp), &(_btrn)->input_queue, node)
 
-INIT_STDERR_LOGGING(0);
-
 struct btr_node *btr_new_node(char *name, struct btr_node *parent)
 {
        struct btr_node *btrn = para_malloc(sizeof(*btrn));
@@ -77,7 +75,7 @@ static struct btr_buffer *new_btrb(char *buf, size_t size)
 /*
  * Deallocate the reference, release the resources if refcount drops to zero.
  */
-void btr_drop_buffer_reference(struct btr_buffer_reference *br)
+static void btr_drop_buffer_reference(struct btr_buffer_reference *br)
 {
        struct btr_buffer *btrb = br->btrb;
 
@@ -111,7 +109,7 @@ void btr_add_output(char *buf, size_t size, struct btr_node *btrn)
        add_btrb_to_children(btrb, btrn);
 }
 
-void btr_pushdown_br(struct btr_buffer_reference *br, struct btr_node *btrn)
+static void btr_pushdown_br(struct btr_buffer_reference *br, struct btr_node *btrn)
 {
        add_btrb_to_children(br->btrb, btrn);
        btr_drop_buffer_reference(br);
@@ -150,6 +148,7 @@ struct btr_buffer_reference *btr_next_br(struct btr_node *btrn)
        return list_first_entry(&btrn->input_queue, struct btr_buffer_reference, node);
 }
 
+
 static inline size_t br_available_bytes(struct btr_buffer_reference *br)
 {
        return br->btrb->size - br->consumed;
@@ -197,8 +196,3 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
                size += br_available_bytes(br);
        return size;
 }
-
-int main(void)
-{
-       return 1;
-}