From 2f01f65e708ae5b51a5d63f1a429261e6223bea5 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 1 Sep 2011 12:51:54 +0000 Subject: [PATCH] remove global sdt_wakeup, use saved transponder id to detect transponder change Last commit for now, neutrino should compile again. Testing and feedback needed. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1659 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/10f4967cf61f63628482627442a0e452c06bf93e Author: [CST] Focus Date: 2011-09-01 (Thu, 01 Sep 2011) --- src/zapit/src/sdt.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/sdt.cpp b/src/zapit/src/sdt.cpp index a48dcc114..210bcb25d 100644 --- a/src/zapit/src/sdt.cpp +++ b/src/zapit/src/sdt.cpp @@ -372,7 +372,7 @@ _repeat: int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id, t_satellite_position satellitePosition, freq_id_t freq) { - extern bool sdt_wakeup;//zapit.cpp + //extern bool sdt_wakeup;//zapit.cpp unsigned char buffer[SDT_SIZE]; /* position in buffer */ @@ -394,6 +394,8 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const unsigned char filter[DMX_FILTER_SIZE]; unsigned char mask[DMX_FILTER_SIZE]; + transponder_id_t current_tp_id = CFrontend::getInstance()->getTsidOnid(); + memset(filter, 0x00, DMX_FILTER_SIZE); filter[0] = 0x42; filter[1] = (p_transport_stream_id >> 8) & 0xff; @@ -464,16 +466,21 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const } } free_CA_mode = -1; - +#if 0 if(sdt_wakeup){//break scan , transponder change ret = -2; break; } +#endif + if(current_tp_id != CFrontend::getInstance()->getTsidOnid()) + break; } } while (filter[4]++ != buffer[7]); delete dmx; + if(current_tp_id != CFrontend::getInstance()->getTsidOnid()) + ret = -2; + return ret; } -