Link buffer_tree.o into para_recv and para_write.

diff --git a/buffer_tree.c b/buffer_tree.c
index b3aea0e4143cbed3ecaff1ca56055106b6108e5a..084827e3d34c0952588f1a751a20ffe32eb28467 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -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)
 
 #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));
 struct btr_node *btr_new_node(char *name, struct btr_node *parent)
 {
        struct btr_node *btrn = para_malloc(sizeof(*btrn));


@@ -198,8 +196,3 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
                size += br_available_bytes(br);
        return size;
 }
                size += br_available_bytes(br);
        return size;
 }

-
-int main(void)
-{
-       return 1;
-}

diff --git a/configure.ac b/configure.ac
index 9c2fe5b225e64cb1623bc3143bfd3d10e5e658fb..e3c9b4a1fa645e2b086b116633ba69413ac71bbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client exec send_common ggo
 udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
 server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
 client_common recv stdout filter stdin audioc write client exec send_common ggo
 udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
 server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh

-wma_common wmadec_filter
+wma_common wmadec_filter buffer_tree

 "
 
 all_executables="server recv filter audioc write client afh"
 "
 
 all_executables="server recv filter audioc write client afh"


@@ -99,7 +99,7 @@ all_executables="server recv filter audioc write client afh"
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv

-       fd sched stdout ggo udp_recv fec"
+       fd sched stdout ggo udp_recv fec buffer_tree"

 recv_ldflags=""
 
 receivers=" http dccp udp"
 recv_ldflags=""
 
 receivers=" http dccp udp"


@@ -139,7 +139,8 @@ server_ldflags="-losl"
 server_audio_formats=" mp3"
 
 write_cmdline_objs="add_cmdline(write file_write)"
 server_audio_formats=" mp3"
 
 write_cmdline_objs="add_cmdline(write file_write)"

-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+write_errlist_objs="write write_common file_write time fd string sched stdin
+       buffer_tree ggo"

 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"

diff --git a/error.h b/error.h
index 755821068cabc9d33525cf28189b81015365974d..6b5e300f56450de4119f1e0e3d88b50105677717 100644 (file)
--- a/error.h
+++ b/error.h
@@ -34,6 +34,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SERVER_COMMAND_LIST_ERRORS
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS
 #define SERVER_COMMAND_LIST_ERRORS
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS

+#define BUFFER_TREE_ERRORS

 
 
 extern const char **para_errlist[];
 
 
 extern const char **para_errlist[];