Revert "More elegant solution by perexg"

This reverts commit 130f413ed8bb79b62d6f45955118729f654bee2e.

- moved the pid 21 addition to the right if block

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 6b61bba9a7a14e89df3d5be85198ba8b32b03502..08eb779a9f8a32684f49f0026442aed7c2ac893c 100644 (file)
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -557,8 +557,6 @@ satip_frontend_update_pids
           mpegts_pid_add(&tr->sf_pids, mp->mp_pid, mps->mps_weight);
       }
     }
-    if (lfe->sf_device->sd_fritz_quirk)
-      mpegts_pid_add(&tr->sf_pids, 21, 1);
   }
   pthread_mutex_unlock(&lfe->sf_dvr_lock);
 
@@ -1215,6 +1213,8 @@ new_tune:
     rtsp_flags |= SATIP_SETUP_PIDS0;
   if (lfe->sf_device->sd_pilot_on)
     rtsp_flags |= SATIP_SETUP_PILOT_ON;
+  if (lfe->sf_device->sd_fritz_quirk)
+    rtsp_flags |= SATIP_SETUP_FRITZ_QUIRK;
   r = -12345678;
   pthread_mutex_lock(&lfe->sf_dvr_lock);
   if (lfe->sf_req == lfe->sf_req_thread)

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
index 789228f3a311eee6a9662cb4b16f5d6de14b540b..c6044d5223dac12fb8db2599370a53a3772408db 100644 (file)
--- a/src/input/mpegts/satip/satip_private.h
+++ b/src/input/mpegts/satip/satip_private.h
@@ -223,6 +223,7 @@ int satip_satconf_get_position
 #define SATIP_SETUP_PLAY     (1<<0)
 #define SATIP_SETUP_PIDS0    (1<<1)
 #define SATIP_SETUP_PILOT_ON (1<<2)
+#define SATIP_SETUP_FRITZ_QUIRK   (1<<3)
 
 int
 satip_rtsp_setup( http_client_t *hc,

diff --git a/src/input/mpegts/satip/satip_rtsp.c b/src/input/mpegts/satip/satip_rtsp.c
index 9c09d576797e571ad270cb941c46ffed242f0d50..6c67237845932d0d0398460d99db82b30f1ff921 100644 (file)
--- a/src/input/mpegts/satip/satip_rtsp.c
+++ b/src/input/mpegts/satip/satip_rtsp.c
@@ -220,8 +220,11 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe,
       ADD(dmc_fe_modulation, mtype,
           dmc->dmc_fe_delsys == DVB_SYS_ATSC ? "8vsb" : "64qam");
   }
-  if (flags & SATIP_SETUP_PIDS0)
+  if (flags & SATIP_SETUP_PIDS0) {
     strcat(buf, "&pids=0");
+    if (flags & SATIP_SETUP_FRITZ_QUIRK)
+      strcat(buf, ",21");
+  }
   tvhtrace("satip", "setup params - %s", buf);
   if (hc->hc_rtsp_stream_id >= 0)
     snprintf(stream = _stream, sizeof(_stream), "/stream=%li",