mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

tiny SDT scan change

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1199 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 3897490d71
Author: Jacek Jendrzej <overx300@gmail.com>
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
This commit is contained in:
Jacek Jendrzej
2011-02-25 05:11:27 +00:00
parent 1fee812431
commit dba922a7c7
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/zapit/src/sdt.cpp
View File

@@ -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(filter, 0x00, DMX_FILTER_SIZE);
memset(mask, 0x00, DMX_FILTER_SIZE); memset(mask, 0x00, DMX_FILTER_SIZE);
memset(filter, 0x00, DMX_FILTER_SIZE);
filter[0] = 0x42; filter[0] = 0x42;
filter[1] = (p_transport_stream_id >> 8) & 0xff; filter[1] = (p_transport_stream_id >> 8) & 0xff;
filter[2] = p_transport_stream_id & 0xff; filter[2] = p_transport_stream_id & 0xff;
// filter[3] = 0x00; filter[4] = 0x00;
filter[4] = 0x00;
filter[5] = 0x00;
filter[6] = (p_original_network_id >> 8) & 0xff; filter[6] = (p_original_network_id >> 8) & 0xff;
filter[7] = p_original_network_id & 0xff; filter[7] = p_original_network_id & 0xff;
//memset(&filter[8], 0x00, 8);
memset(mask, 0x00, DMX_FILTER_SIZE);
mask[0] = 0xFF; mask[0] = 0xFF;
mask[1] = 0xFF; mask[1] = 0xFF;
mask[2] = 0xFF; mask[2] = 0xFF;
// mask[3] = 0x00; mask[4] = 0xFF;
mask[4] = 0xFF;
mask[5] = 0xFF;
mask[6] = 0xFF; mask[6] = 0xFF;
mask[7] = 0xFF; mask[7] = 0xFF;
// memset(&mask[8], 0x00, 8);
std::vector<std::pair<int,int> > sidpmt; std::vector<std::pair<int,int> > sidpmt;
int pat_ok = scan_parse_pat( sidpmt ); int pat_ok = scan_parse_pat( sidpmt );

9
src/zapit/src/zapit.cpp
View File

@@ -2229,17 +2229,14 @@ int zapit_main_thread(void *data)
/* create bouquet manager */ /* create bouquet manager */
g_bouquetManager = new CBouquetManager(); g_bouquetManager = new CBouquetManager();
bool tv_mode = true;
if (config.getInt32("lastChannelMode", 0)){ if (config.getInt32("lastChannelMode", 0)){
setRadioMode(); setRadioMode();
tv_mode = false;
} }
else{ else{
setTVMode(); setTVMode();
tv_mode = true;
} }
if(ZapStart_arg->uselastchannel == 0){ 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; lastChannelRadio = ZapStart_arg->startchannelradio_nr;
lastChannelTV = ZapStart_arg->startchanneltv_nr; lastChannelTV = ZapStart_arg->startchanneltv_nr;
} }
@@ -2491,8 +2488,10 @@ printf("[sdt monitor] wakeup...\n");
curchans.clear(); curchans.clear();
ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq); ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq);
if(ret) if(ret){
printf("[sdt monitor] scanSDT broken ?\n");
continue; continue;
}
sdt_tp.insert(std::pair <transponder_id_t, bool> (tpid, true) ); sdt_tp.insert(std::pair <transponder_id_t, bool> (tpid, true) );
char buffer[256]; char buffer[256];