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

Include radio stations in the service probe.

Browse source
This commit is contained in:
John Törnblom 2011-01-27 16:05:26 +01:00
parent 6fa99fbd59
commit 901c71347f
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/service.c
View file

@ -720,6 +720,14 @@ service_is_tv(service_t *t)
t->s_servicetype == ST_AC_HDTV;
}
/**
*
*/
int
service_is_radio(service_t *t)
{
return t->s_servicetype == ST_RADIO;
}
/**
*

2
src/service.h
View file

@ -516,6 +516,8 @@ const char *service_servicetype_txt(service_t *t);
int service_is_tv(service_t *t);
int service_is_radio(service_t *t);
void service_destroy(service_t *t);
void service_remove_subscriber(service_t *t, struct th_subscription *s,

15
src/serviceprobe.c
View file

@ -44,8 +44,8 @@ static pthread_cond_t serviceprobe_cond;
void
serviceprobe_enqueue(service_t *t)
{
if(!service_is_tv(t))
return; /* Don't even consider non-tv channels */
if(!service_is_tv(t) && !service_is_radio(t))
return; /* Don't even consider non-tv/non-radio channels */
if(t->s_sp_onqueue)
return;
@ -170,9 +170,11 @@ serviceprobe_thread(void *aux)
tvhlog(LOG_INFO, "serviceprobe", "%20s: mapped to channel \"%s\"",
t->s_svcname, t->s_svcname);
channel_tag_map(ch, channel_tag_find_by_name("TV channels", 1), 1);
tvhlog(LOG_INFO, "serviceprobe", "%20s: joined tag \"%s\"",
t->s_svcname, "TV channels");
if(service_is_tv(t)) {
channel_tag_map(ch, channel_tag_find_by_name("TV channels", 1), 1);
tvhlog(LOG_INFO, "serviceprobe", "%20s: joined tag \"%s\"",
t->s_svcname, "TV channels");
}
switch(t->s_servicetype) {
case ST_SDTV:
@ -183,6 +185,9 @@ serviceprobe_thread(void *aux)
case ST_AC_HDTV:
str = "HDTV";
break;
case ST_RADIO:
str = "Radio";
break;
default:
str = NULL;
}