Fix some typos and compilation errors (TRACE disabled)

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 5a9e8949dbe0261e92807ee39822802f0ad2e341..48c6e6bfb98fd67478da533edccf6f533e2a6902 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -631,7 +631,7 @@ linuxdvb_frontend_monitor ( void *aux )
   sigstat.snr         = mmi->mmi_stats.snr;
   sigstat.signal      = mmi->mmi_stats.signal;
   sigstat.ber         = mmi->mmi_stats.ber;
-  sigstat.unc         = mmi->mmi_stats.ber;
+  sigstat.unc         = mmi->mmi_stats.unc;
   sm.sm_type = SMT_SIGNAL_STATUS;
   sm.sm_data = &sigstat;
   LIST_FOREACH(s, &lfe->mi_transports, s_active_link) {

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index 98364fcc99ab1c318691f343808d57bd2d3e674a..0e66b4d52c7057a30b91ae4a74677dc52cb5c2a0 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -884,7 +884,7 @@ linuxdvb_satconf_ele_get_priority ( mpegts_input_t *mi )
 {
   int prio = 0;
   linuxdvb_satconf_t *ls = ((linuxdvb_satconf_ele_t*)mi)->ls_parent;
-  if (!ls->ls_frontend)
+  if (ls->ls_frontend)
     prio = ls->ls_frontend->mi_get_priority(ls->ls_frontend);
   return prio + mpegts_input_get_priority(mi);
 }

diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c
index 2afc51ac7681b22cfd8bbe4f5cfa78f2d6d3e9a2..eaa0788c06150999d65fa7bc9794b2bc30f336ca 100644 (file)
--- a/src/timeshift/timeshift_reader.c
+++ b/src/timeshift/timeshift_reader.c
@@ -732,6 +732,7 @@ void *timeshift_reader ( void *p )
                ((cur_speed > 0) && (sm->sm_time <= deliver))))) {
 
       if (sm->sm_type == SMT_PACKET) {
+#if ENABLE_TRACE
         th_pkt_t *pkt = sm->sm_data;
         tvhtrace("timeshift",
                  "ts %d pkt out - stream %d type %c pts %10"PRId64
@@ -743,6 +744,7 @@ void *timeshift_reader ( void *p )
                  ts_rescale(pkt->pkt_dts, 1000000),
                  pkt->pkt_duration,
                  pktbuf_len(pkt->pkt_payload), sm->sm_time);
+#endif
       }
       streaming_target_deliver2(ts->output, sm);
       last_time = sm->sm_time;