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

…nstall
tvheadend · May 5, 2015 · f5fd889 · f5fd889
1 parent 22392fa
commit f5fd889
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);