stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix some fallout from last commit

Browse source
This commit is contained in:
Andreas Öman 2010-03-18 20:57:30 +00:00
parent 3be19d4b8a
commit 55c8d07791
4 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rtsp.c
View file

@ -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;

2
src/subscriptions.c
View file

@ -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;
}
}

16
src/transports.c
View file

@ -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;

2
src/transports.h
View file

@ -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)