Moved the frontend hack to the right place.

tvheadend · May 13, 2015 · aa97cb4 · aa97cb4
1 parent 4ce39c6
commit aa97cb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
@@ -385,7 +385,6 @@ satip_device_calc_uuid( tvh_uuid_t *uuid, const char *satip_uuid )
 static void
 satip_device_hack( satip_device_t *sd )
 {
-  satip_frontend_t *lfe;
   if(sd->sd_disable_workarounds)
       return;
   if (sd->sd_info.deviceid[0] &&
@@ -410,8 +409,6 @@ satip_device_hack( satip_device_t *sd )
     sd->sd_no_univ_lnb = 1;
   } else if (strstr(sd->sd_info.manufacturer, "AVM Berlin") &&
              strstr(sd->sd_info.modelname, "FRITZ!")) {
-    TAILQ_FOREACH(lfe, &sd->sd_frontends, sf_link)
-             lfe->sf_play2 = 1;
     sd->sd_fullmux_ok  = 0;
     sd->sd_pids_deladd = 0;
     sd->sd_pids0       = 1;
@@ -536,8 +533,6 @@ satip_device_create( satip_device_info_t *info )
     }
   }
 
-  satip_device_hack(sd);
-
   if (save)
     satip_device_save(sd);
 

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
@@ -1530,6 +1530,9 @@ satip_frontend_hacks( satip_frontend_t *lfe, int *def_positions )
     lfe->sf_teardown_delay = 1;
   } else if (!strcmp(sd->sd_info.modelname, "IPLNB")) {
     *def_positions = 1;
+  } else if (strstr(sd->sd_info.manufacturer, "AVM Berlin") &&
+              strstr(sd->sd_info.modelname, "FRITZ!")) {
+    lfe->sf_play2 = 1;
   }
 }