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

mpegts mux dvb: remove the migration code (it's in src/config.c)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-07-01 19:31:05 +02:00
parent 6f4ceabb3f
commit 43ab41a3b6
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/input/mpegts/mpegts_mux_dvb.c
View file

@ -631,8 +631,6 @@ dvb_mux_create0
dvb_mux_t *lm;
htsmsg_t *c, *e;
htsmsg_field_t *f;
mpegts_service_t *ts;
int move = 0;
/* Class */
if (ln->ln_type == DVB_TYPE_S)
@ -678,24 +676,12 @@ dvb_mux_create0
c = hts_settings_load_r(1, "input/dvb/networks/%s/muxes/%s/services",
idnode_uuid_as_str(&ln->mn_id),
idnode_uuid_as_str(&mm->mm_id));
if (!c) {
move = 1;
c = hts_settings_load_r(1, "input/linuxdvb/networks/%s/muxes/%s/services",
idnode_uuid_as_str(&ln->mn_id),
idnode_uuid_as_str(&mm->mm_id));
}
if (c) {
HTSMSG_FOREACH(f, c) {
if (!(e = htsmsg_get_map_by_field(f))) continue;
ts = mpegts_service_create1(f->hmf_name, (mpegts_mux_t *)lm, 0, 0, e);
if (ts && move)
ts->s_config_save((service_t *)ts);
mpegts_service_create1(f->hmf_name, (mpegts_mux_t *)lm, 0, 0, e);
}
htsmsg_destroy(c);
if (move)
hts_settings_remove("input/linuxdvb/networks/%s/muxes/%s/services",
idnode_uuid_as_str(&ln->mn_id),
idnode_uuid_as_str(&mm->mm_id));
}
return lm;