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

mpegts network: Fix the issue with no predefined muxes at the network creation

Browse source
This commit is contained in:
Jaroslav Kysela 2014-08-12 20:42:57 +02:00
parent 34dd2b8da8
commit 5a621b2ff0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ dvb_network_class_scanfile_set ( void *o, const void *s )
return 0;
if (!(sfn = scanfile_find(s)))
return 0;
/* Create */
LIST_FOREACH(dmc, &sfn->sfn_muxes, dmc_link) {
if (!(mm = dvb_network_find_mux(ln, dmc, MPEGTS_ONID_NONE, MPEGTS_TSID_NONE))) {
@ -514,6 +514,7 @@ dvb_network_create0
dvb_network_t *ln;
htsmsg_t *c, *e;
htsmsg_field_t *f;
const char *s;
ln = calloc(1, sizeof(dvb_network_t));
if (idc == &dvb_network_dvbt_class)
@ -541,6 +542,11 @@ dvb_network_create0
if (!conf)
return ln;
/* Set predefined muxes */
/* Because PO_NOSAVE in idnode_load() this value is not set on load */
if ((s = htsmsg_get_str(conf, "scanfile")) != NULL)
dvb_network_class_scanfile_set(ln, s);
/* Load muxes */
if ((c = hts_settings_load_r(1, "input/dvb/networks/%s/muxes", uuid))) {
HTSMSG_FOREACH(f, c) {