From ee03fde53ab9f7c480c269e623e906876ae7e675 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Tue, 10 Sep 2013 23:56:38 +0100 Subject: [PATCH] subscriptions: add extra debug --- src/subscriptions.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/subscriptions.c b/src/subscriptions.c index 062c9924..7ad7766f 100644 --- a/src/subscriptions.c +++ b/src/subscriptions.c @@ -72,6 +72,8 @@ subscription_link_service(th_subscription_t *s, service_t *t) s->ths_service = t; LIST_INSERT_HEAD(&t->s_subscriptions, s, ths_service_link); + tvhtrace("subscription", "linking sub %p to svc %p", s, t); + pthread_mutex_lock(&t->s_stream_mutex); if(TAILQ_FIRST(&t->s_components) != NULL) { @@ -86,7 +88,6 @@ subscription_link_service(th_subscription_t *s, service_t *t) // Link to service output streaming_target_connect(&t->s_streaming_pad, &s->ths_input); - if(s->ths_start_message != NULL && t->s_streaming_status & TSS_PACKETS) { s->ths_state = SUBSCRIPTION_GOT_SERVICE; @@ -113,6 +114,8 @@ subscription_unlink_service(th_subscription_t *s, int reason) streaming_message_t *sm; service_t *t = s->ths_service; + tvhtrace("subscription", "unlinking sub %p from svc %p", s, t); + pthread_mutex_lock(&t->s_stream_mutex); // Unlink from service output @@ -363,7 +366,7 @@ subscription_unsubscribe(th_subscription_t *s) s->ths_title); } - if(si != NULL) + if(si) service_remove_subscriber(t, s, SM_CODE_OK); #if ENABLE_MPEGTS