mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove global sdt_wakeup, use saved transponder id to detect transponder change

Browse Source 
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: 10f4967cf6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-01 (Thu, 01 Sep 2011)
This commit is contained in:
[CST] Focus
2011-09-01 12:51:54 +00:00
parent 6c3f94da3c
commit 2f01f65e70
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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, 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) 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]; unsigned char buffer[SDT_SIZE];
/* position in buffer */ /* 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 filter[DMX_FILTER_SIZE];
unsigned char mask[DMX_FILTER_SIZE]; unsigned char mask[DMX_FILTER_SIZE];
transponder_id_t current_tp_id = CFrontend::getInstance()->getTsidOnid();
memset(filter, 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;
@@ -464,16 +466,21 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
} }
} }
free_CA_mode = -1; free_CA_mode = -1;
#if 0
if(sdt_wakeup){//break scan , transponder change if(sdt_wakeup){//break scan , transponder change
ret = -2; ret = -2;
break; break;
} }
#endif
if(current_tp_id != CFrontend::getInstance()->getTsidOnid())
break;
} }
} }
while (filter[4]++ != buffer[7]); while (filter[4]++ != buffer[7]);
delete dmx; delete dmx;
if(current_tp_id != CFrontend::getInstance()->getTsidOnid())
ret = -2;
return ret; return ret;
} }