From 4a9b402ed93c56e81da7cef22d86ee701dc202bf Mon Sep 17 00:00:00 2001
From: satbaby <satbaby@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Fri, 25 Feb 2011 07:48:30 +0000
Subject: [PATCH] break SDT scan if transponder changed

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1201 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/zapit/src/sdt.cpp   | 6 +++++-
 src/zapit/src/zapit.cpp | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zapit/src/sdt.cpp b/src/zapit/src/sdt.cpp
index fad341fa6..6f1906ead 100644
--- a/src/zapit/src/sdt.cpp
+++ b/src/zapit/src/sdt.cpp
@@ -373,7 +373,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
 	unsigned char buffer[SDT_SIZE];
 
 	/* position in buffer */
@@ -437,6 +437,7 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
 			EIT_schedule_flag = buffer[pos + 2] & 0x02;
 			EIT_present_following_flag = buffer[pos + 2] & 0x01;
 			running_status = buffer [pos + 3] & 0xE0;
+
 			for (unsigned short i=0; i<sidpmt.size() && pat_ok == 1; i++){
 				if(sidpmt[i].first == service_id && running_status != 32 ){
 					tmp_free_CA_mode = scan_parse_pmt( sidpmt[i].second, sidpmt[i].first );
@@ -466,6 +467,9 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
 				}
 			}
 			free_CA_mode = -1;
+			if(sdt_wakeup){
+				return -2;//break scan , transponder change
+			}
 		}
 	}
 	while (filter[4]++ != buffer[7]);
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 0b11af4fd..7d7364281 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2489,7 +2489,8 @@ printf("[sdt monitor] wakeup...\n");
 
 			ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq);
 			if(ret){
-				printf("[sdt monitor] scanSDT broken ?\n");
+				if(ret == -1)
+					printf("[sdt monitor] scanSDT broken ?\n");
 				continue;
 			}
 			sdt_tp.insert(std::pair <transponder_id_t, bool> (tpid, true) );