From 43ab41a3b64a35e3336204b01d0941ff3c8ccf11 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 1 Jul 2014 19:31:05 +0200
Subject: [PATCH] mpegts mux dvb: remove the migration code (it's in
 src/config.c)

---
 src/input/mpegts/mpegts_mux_dvb.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index 91f593d3..8896db7b 100644
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -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;