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

linuxdvb: honour the autodiscovery option

Browse source
This commit is contained in:
Adam Sutton 2013-09-18 14:09:32 +01:00
parent 8db7690c93
commit 0f7848cc00
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/input/mpegts/iptv/iptv.c
View file

@ -470,13 +470,6 @@ const idclass_t iptv_network_class = {
}
};
static mpegts_mux_t *
iptv_network_create_mux
( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *conf )
{
return NULL;
}
static mpegts_mux_t *
iptv_network_create_mux2
( mpegts_network_t *mm, htsmsg_t *conf )
@ -525,7 +518,6 @@ void iptv_init ( void )
/* Init Network */
mpegts_network_create0((mpegts_network_t*)&iptv_network,
&iptv_network_class, NULL, "IPTV Network", NULL);
iptv_network.mn_create_mux = iptv_network_create_mux;
iptv_network.mn_create_service = iptv_network_create_service;
iptv_network.mn_mux_class = iptv_network_mux_class;
iptv_network.mn_mux_create2 = iptv_network_create_mux2;

3
src/input/mpegts/linuxdvb/linuxdvb_network.c
View file

@ -135,10 +135,9 @@ static mpegts_mux_t *
linuxdvb_network_create_mux
( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *dmc )
{
// TODO: should we have a mux_find wrapper?
linuxdvb_network_t *ln = (linuxdvb_network_t*)mm->mm_network;
mm = linuxdvb_network_find_mux(ln, dmc);
if (!mm) {
if (!mm && ln->mn_autodiscovery) {
mm = (mpegts_mux_t*)linuxdvb_mux_create0(ln, onid, tsid, dmc, NULL, NULL);
if (mm)
mm->mm_config_save(mm);