aacdec: Reset "consumed" at each iteration.

[paraslash.git] / buffer_tree.h

diff --git a/buffer_tree.h b/buffer_tree.h
index 27f5da2fb9d971c16279a981ef5525372e23f5f6..903996860c56750d23fd53b629ed58fd03e58296 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -4,9 +4,16 @@ struct btr_node;
 typedef int (*btr_command_handler)(struct btr_node *btrn,
                const char *command, char **result);
 
-struct btr_node *btr_new_node(char *name, struct btr_node *parent,
+enum btr_node_type {
+       BTR_NT_ROOT,
+       BTR_NT_INTERNAL,
+       BTR_NT_LEAF,
+};
+
+struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
                btr_command_handler handler, void *context);
-void btr_del_node(struct btr_node *btrn);
+void btr_remove_node(struct btr_node *btrn);
+void btr_free_node(struct btr_node *btrn);
 void btr_add_output(char *buf, size_t size, struct btr_node *btrn);
 bool btr_no_children(struct btr_node *btrn);
 size_t btr_bytes_pending(struct btr_node *btrn);
@@ -16,6 +23,13 @@ size_t btr_next_buffer(struct btr_node *btrn, char **bufp);
 void btr_consume(struct btr_node *btrn, size_t numbytes);
 int btr_exec(struct btr_node *btrn, const char *command, char **value_result);
 int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result);
-int btr_splice_out_node(struct btr_node *btrn);
+void btr_splice_out_node(struct btr_node *btrn);
 void btr_pushdown(struct btr_node *btrn);
 void *btr_context(struct btr_node *btrn);
+void btr_merge(struct btr_node *btrn, size_t dest_size);
+bool btr_eof(struct btr_node *btrn);
+void btr_log_tree(struct btr_node *btrn, int loglevel);
+int btr_pushdown_one(struct btr_node *btrn);
+bool btr_inplace_ok(struct btr_node *btrn);
+int btr_node_status(struct btr_node *btrn, size_t min_iqs,
+               enum btr_node_type type);