From da9e6d1fd6dccd12c86350272cf2a09c364043a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Thu, 4 Jun 2009 05:49:31 +0000 Subject: [PATCH] Remove dead code --- src/transports.c | 45 --------------------------------------------- src/transports.h | 4 ---- 2 files changed, 49 deletions(-) diff --git a/src/transports.c b/src/transports.c index af2cc2c6..a7e83701 100644 --- a/src/transports.c +++ b/src/transports.c @@ -64,8 +64,6 @@ transport_stop(th_transport_t *t) gtimer_disarm(&t->tht_receive_timer); - // dtimer_disarm(&transport_monitor_timer, transport_monitor, t, 1); - t->tht_stop_feed(t); pthread_mutex_lock(&t->tht_stream_mutex); @@ -151,47 +149,6 @@ transport_remove_subscriber(th_transport_t *t, th_subscription_t *s) transport_stop(t); } -#if 0 -/** - * - */ -void -transport_link_muxer(th_transport_t *t, th_muxer_t *tm) -{ - lock_assert(&global_lock); - - if(tm->tm_transport != NULL) { - assert(tm->tm_transport == t); - return; - } - - pthread_mutex_lock(&t->tht_stream_mutex); - LIST_INSERT_HEAD(&t->tht_muxers, tm, tm_transport_link); - pthread_mutex_unlock(&t->tht_stream_mutex); - tm->tm_transport = t; -} - - -/** - * - */ -void -transport_unlink_muxer(th_muxer_t *tm) -{ - th_transport_t *t = tm->tm_transport; - - if(t == NULL) - return; - - lock_assert(&global_lock); - - pthread_mutex_lock(&t->tht_stream_mutex); - LIST_REMOVE(tm, tm_transport_link); - pthread_mutex_unlock(&t->tht_stream_mutex); - tm->tm_transport = NULL; -} -#endif - /** * @@ -439,8 +396,6 @@ transport_destroy(th_transport_t *t) subscription_unlink_transport(s); } - //dtimer_disarm(&t->tht_receive_timer); - free((void *)t->tht_name); if(t->tht_ch != NULL) { diff --git a/src/transports.h b/src/transports.h index d1a36250..efac9ecb 100644 --- a/src/transports.h +++ b/src/transports.h @@ -64,10 +64,6 @@ const char *transport_feed_status_to_text(transport_feed_status_t status); void transport_remove_subscriber(th_transport_t *t, th_subscription_t *s); -//void transport_link_muxer(th_transport_t *t, th_muxer_t *tm); - -//void transport_unlink_muxer(th_muxer_t *tm); - static inline th_stream_t * transport_find_stream_by_pid(th_transport_t *t, int pid) {