From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 5 May 2015 18:02:52 +0000 (+0200)
Subject: mpegts: PID handling - fix thinkos (used wrong field for psi_tables_install
X-Git-Tag: v4.1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5fd8892c689e4cd9ab6e4828826c9e34028ea86;p=thirdparty%2Ftvheadend.git

mpegts: PID handling - fix thinkos (used wrong field for psi_tables_install
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 312a95e92..91c2b7397 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -541,7 +541,7 @@ linuxdvb_frontend_monitor ( void *aux )
 
       /* Table handlers */
       psi_tables_install((mpegts_input_t *)lfe, mm,
-                         ((dvb_mux_t *)mm)->lm_tuning.dmc_fe_type);
+                         ((dvb_mux_t *)mm)->lm_tuning.dmc_fe_delsys);
 
     /* Re-arm (quick) */
     } else {
diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index 2938097ae..259167ecc 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -788,6 +788,7 @@ mpegts_mux_update_pids_cb ( void *aux )
     mi = mm->mm_active->mmi_input;
     if (mi) {
       pthread_mutex_lock(&mi->mi_output_lock);
+      mm->mm_update_pids_flag = 0;
       mi->mi_update_pids(mi, mm);
       pthread_mutex_unlock(&mi->mi_output_lock);
     }
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 08eb779a9..a986d6881 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -65,7 +65,7 @@ satip_frontend_signal_cb( void *aux )
     return;
   if (!lfe->sf_tables) {
     psi_tables_install(mmi->mmi_input, mmi->mmi_mux,
-                       ((dvb_mux_t *)mmi->mmi_mux)->lm_tuning.dmc_fe_type);
+                       ((dvb_mux_t *)mmi->mmi_mux)->lm_tuning.dmc_fe_delsys);
     lfe->sf_tables = 1;
   }
   sigstat.status_text  = signal2str(lfe->sf_status);
diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
index 0ee67c933..ab11024a8 100644
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -260,7 +260,7 @@ tvhdhomerun_frontend_monitor_cb( void *aux )
 
       /* install table handlers */
       psi_tables_install(mmi->mmi_input, mm,
-                         ((dvb_mux_t *)mm)->lm_tuning.dmc_fe_type);
+                         ((dvb_mux_t *)mm)->lm_tuning.dmc_fe_delsys);
 
     } else { // quick re-arm the timer to wait for signal lock
       gtimer_arm_ms(&hfe->hf_monitor_timer, tvhdhomerun_frontend_monitor_cb, hfe, 50);