diff --git a/src/rtsp.c b/src/rtsp.c index 7160cbf2..5806a1ea 100644 --- a/src/rtsp.c +++ b/src/rtsp.c @@ -465,7 +465,7 @@ rtsp_streaming_input(void *opaque, streaming_message_t *sm) case SMT_NOSTART: pthread_mutex_lock(&rtsp->rtsp_start_mutex); - rtsp->rtsp_start_error = transport_nostart2txt(sm->sm_code); + rtsp->rtsp_start_error = streaming_code2txt(sm->sm_code); pthread_cond_signal(&rtsp->rtsp_start_cond); pthread_mutex_unlock(&rtsp->rtsp_start_mutex); break; diff --git a/src/subscriptions.c b/src/subscriptions.c index 5489741b..efe45c8d 100644 --- a/src/subscriptions.c +++ b/src/subscriptions.c @@ -358,7 +358,7 @@ subscription_create_from_transport(th_transport_t *t, const char *name, tvhlog(LOG_INFO, "subscription", "\"%s\" direct subscription failed -- %s", name, - transport_nostart2txt(r)); + streaming_code2txt(r)); return NULL; } } diff --git a/src/transports.c b/src/transports.c index 3172e928..ef43eaa2 100644 --- a/src/transports.c +++ b/src/transports.c @@ -54,18 +54,6 @@ static struct th_transport_list transporthash[TRANSPORT_HASH_WIDTH]; static void transport_data_timeout(void *aux); -/** - * - */ -const char * -transport_nostart2txt(int code) -{ - switch(code) { - } - return "Unknown error"; -} - - /** * */ @@ -432,7 +420,7 @@ transport_find(channel_t *ch, unsigned int weight, const char *loginfo, if((r = transport_start(t, 0, 0)) == 0) return t; tvhlog(LOG_DEBUG, "Transport", "%s: Unable to use \"%s\" -- %s", - loginfo, transport_nicename(t), transport_nostart2txt(r)); + loginfo, transport_nicename(t), streaming_code2txt(r)); } /* Ok, nothing, try again, but supply our weight and thus, try to steal @@ -446,7 +434,7 @@ transport_find(channel_t *ch, unsigned int weight, const char *loginfo, if(loginfo != NULL) tvhlog(LOG_NOTICE, "Transport", "%s: Skipping \"%s\" -- %s", - loginfo, transport_nicename(t), transport_nostart2txt(r)); + loginfo, transport_nicename(t), streaming_code2txt(r)); } if(errorp != NULL) *errorp = error; diff --git a/src/transports.h b/src/transports.h index 366549eb..254c4aef 100644 --- a/src/transports.h +++ b/src/transports.h @@ -99,8 +99,6 @@ const char *transport_nicename(th_transport_t *t); const char *transport_component_nicename(th_stream_t *st); -const char *transport_nostart2txt(int code); - const char *transport_tss2text(int flags); static inline int transport_tss_is_error(int flags)