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

move transport_set_channel() to transport.c and add transport_set_prio()

Browse source
This commit is contained in:
Andreas Öman 2007-12-07 08:24:13 +00:00
parent fc024a0099
commit 2036062aa4
3 changed files with 74 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
channels.c
View file

@ -239,66 +239,6 @@ channel_find(const char *name, int create, th_channel_group_t *tcg)
}
/**
*
*/
static int
transportcmp(th_transport_t *a, th_transport_t *b)
{
return a->tht_prio - b->tht_prio;
}
/**
*
*/
int
transport_set_channel(th_transport_t *t, th_channel_t *ch)
{
th_stream_t *st;
char *chname;
const char *n;
char pid[30];
char lang[30];
assert(t->tht_uniquename != NULL);
t->tht_channel = ch;
LIST_INSERT_SORTED(&ch->ch_transports, t, tht_channel_link, transportcmp);
chname = utf8toprintable(ch->ch_name);
syslog(LOG_DEBUG, "Added service \"%s\" for channel \"%s\"",
t->tht_name, chname);
free(chname);
LIST_FOREACH(st, &t->tht_streams, st_link) {
if(st->st_caid != 0) {
n = psi_caid2name(st->st_caid);
} else {
n = htstvstreamtype2txt(st->st_type);
}
if(st->st_pid < 8192) {
snprintf(pid, sizeof(pid), " on pid [%d]", st->st_pid);
} else {
pid[0] = 0;
}
if(st->st_lang[0]) {
snprintf(lang, sizeof(lang), ", language \"%s\"", st->st_lang);
} else {
lang[0] = 0;
}
syslog(LOG_DEBUG, " Stream \"%s\"%s%s", n, lang, pid);
}
return 0;
}
/**
*
*/

72
transports.c
View file

@ -366,3 +366,75 @@ transport_add_stream(th_transport_t *t, int pid, tv_streamtype_t type)
avgstat_init(&st->st_cc_errors, 10);
return st;
}
/**
*
*/
static int
transportcmp(th_transport_t *a, th_transport_t *b)
{
return a->tht_prio - b->tht_prio;
}
/**
*
*/
int
transport_set_channel(th_transport_t *t, th_channel_t *ch)
{
th_stream_t *st;
char *chname;
const char *n;
char pid[30];
char lang[30];
assert(t->tht_uniquename != NULL);
t->tht_channel = ch;
LIST_INSERT_SORTED(&ch->ch_transports, t, tht_channel_link, transportcmp);
chname = utf8toprintable(ch->ch_name);
syslog(LOG_DEBUG, "Added service \"%s\" for channel \"%s\"",
t->tht_name, chname);
free(chname);
LIST_FOREACH(st, &t->tht_streams, st_link) {
if(st->st_caid != 0) {
n = psi_caid2name(st->st_caid);
} else {
n = htstvstreamtype2txt(st->st_type);
}
if(st->st_pid < 8192) {
snprintf(pid, sizeof(pid), " on pid [%d]", st->st_pid);
} else {
pid[0] = 0;
}
if(st->st_lang[0]) {
snprintf(lang, sizeof(lang), ", language \"%s\"", st->st_lang);
} else {
lang[0] = 0;
}
syslog(LOG_DEBUG, " Stream \"%s\"%s%s", n, lang, pid);
}
return 0;
}
/**
*
*/
void
transport_set_priority(th_transport_t *t, int prio)
{
th_channel_t *ch = t->tht_channel;
LIST_REMOVE(t, tht_channel_link);
t->tht_prio = prio;
LIST_INSERT_SORTED(&ch->ch_transports, t, tht_channel_link, transportcmp);
}

2
transports.h
View file

@ -36,4 +36,6 @@ th_transport_t *transport_find(th_channel_t *ch, unsigned int weight);
th_stream_t *transport_add_stream(th_transport_t *t, int pid,
tv_streamtype_t type);
void transport_set_priority(th_transport_t *t, int prio);
#endif /* TRANSPORTS_H */