From dba922a7c7707d578fcaf1a2264968c95d382845 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 25 Feb 2011 05:11:27 +0000 Subject: [PATCH] tiny SDT scan change git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1199 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3897490d71915a131e0df193b3c40d3dc2139f32 Author: Jacek Jendrzej Date: 2011-02-25 (Fri, 25 Feb 2011) Origin message was: ------------------ tiny SDT scan change git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1199 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/zapit/src/sdt.cpp | 12 ++++-------- src/zapit/src/zapit.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/zapit/src/sdt.cpp b/src/zapit/src/sdt.cpp index e0720d82f..fad341fa6 100644 --- a/src/zapit/src/sdt.cpp +++ b/src/zapit/src/sdt.cpp @@ -397,25 +397,21 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const memset(filter, 0x00, DMX_FILTER_SIZE); memset(mask, 0x00, DMX_FILTER_SIZE); + memset(filter, 0x00, DMX_FILTER_SIZE); filter[0] = 0x42; filter[1] = (p_transport_stream_id >> 8) & 0xff; filter[2] = p_transport_stream_id & 0xff; -// filter[3] = 0x00; - filter[4] = 0x00; - filter[5] = 0x00; + filter[4] = 0x00; filter[6] = (p_original_network_id >> 8) & 0xff; filter[7] = p_original_network_id & 0xff; - //memset(&filter[8], 0x00, 8); + memset(mask, 0x00, DMX_FILTER_SIZE); mask[0] = 0xFF; mask[1] = 0xFF; mask[2] = 0xFF; -// mask[3] = 0x00; - mask[4] = 0xFF; - mask[5] = 0xFF; + mask[4] = 0xFF; mask[6] = 0xFF; mask[7] = 0xFF; -// memset(&mask[8], 0x00, 8); std::vector > sidpmt; int pat_ok = scan_parse_pat( sidpmt ); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index f7d667e5c..0b11af4fd 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2229,17 +2229,14 @@ int zapit_main_thread(void *data) /* create bouquet manager */ g_bouquetManager = new CBouquetManager(); - bool tv_mode = true; if (config.getInt32("lastChannelMode", 0)){ setRadioMode(); - tv_mode = false; } else{ setTVMode(); - tv_mode = true; } if(ZapStart_arg->uselastchannel == 0){ - live_channel_id = tv_mode ? ZapStart_arg->startchanneltv_id : ZapStart_arg->startchannelradio_id; + live_channel_id = (currentMode & RADIO_MODE) ? ZapStart_arg->startchannelradio_id : ZapStart_arg->startchanneltv_id ; lastChannelRadio = ZapStart_arg->startchannelradio_nr; lastChannelTV = ZapStart_arg->startchanneltv_nr; } @@ -2491,8 +2488,10 @@ printf("[sdt monitor] wakeup...\n"); curchans.clear(); ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq); - if(ret) + if(ret){ + printf("[sdt monitor] scanSDT broken ?\n"); continue; + } sdt_tp.insert(std::pair (tpid, true) ); char buffer[256];