mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

change transpoder ctor to use transponder_id

Browse Source
This commit is contained in:
[CST] Focus
2012-04-10 14:33:55 +04:00
parent 73906e3591
commit 020958db6a
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zapit/include/zapit/getservices.h
View File

@@ -41,10 +41,11 @@ struct transponder
{ {
t_transport_stream_id transport_stream_id; t_transport_stream_id transport_stream_id;
t_original_network_id original_network_id; t_original_network_id original_network_id;
transponder_id_t transponder_id;
struct dvb_frontend_parameters feparams; struct dvb_frontend_parameters feparams;
unsigned char polarization; unsigned char polarization;
bool updated; bool updated;
#if 0
transponder(const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id, const struct dvb_frontend_parameters p_feparams, const uint8_t p_polarization = 0) transponder(const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id, const struct dvb_frontend_parameters p_feparams, const uint8_t p_polarization = 0)
{ {
transport_stream_id = p_transport_stream_id; transport_stream_id = p_transport_stream_id;
@@ -53,6 +54,16 @@ struct transponder
polarization = p_polarization; polarization = p_polarization;
updated = 0; updated = 0;
} }
#endif
transponder(const transponder_id_t t_id, const struct dvb_frontend_parameters p_feparams, const uint8_t p_polarization = 0)
{
transponder_id = t_id;
transport_stream_id = (t_id >> 16) & 0xFFFF;
original_network_id = t_id & 0xFFFF;
feparams = p_feparams;
polarization = p_polarization;
updated = 0;
}
}; };
typedef std::map <transponder_id_t, transponder> transponder_list_t; typedef std::map <transponder_id_t, transponder> transponder_list_t;

5
src/zapit/src/fastscan.cpp
View File

@@ -482,9 +482,8 @@ bool CServiceScan::ParseFnt(unsigned short pid, unsigned short operator_id)
transponders.insert ( transponders.insert (
std::pair <transponder_id_t, transponder> ( std::pair <transponder_id_t, transponder> (
TsidOnid, TsidOnid,
transponder ( transponder(
transport_stream_id, TsidOnid,
original_network_id,
feparams, feparams,
polarization polarization
) )

10
src/zapit/src/getservices.cpp
View File

@@ -115,7 +115,7 @@ bool CServiceManager::AddNVODChannel(CZapitChannel * &channel)
t_satellite_position satellitePosition = channel->getSatellitePosition(); t_satellite_position satellitePosition = channel->getSatellitePosition();
t_channel_id sub_channel_id = t_channel_id sub_channel_id =
((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) |
(uint64_t) CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(service_id, original_network_id, transport_stream_id); (uint64_t) CREATE_CHANNEL_ID(service_id, original_network_id, transport_stream_id);
channel_insert_res_t ret = nvodchannels.insert ( channel_insert_res_t ret = nvodchannels.insert (
channel_pair_t (sub_channel_id, *channel)); channel_pair_t (sub_channel_id, *channel));
@@ -330,10 +330,8 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
pair<map<transponder_id_t, transponder>::iterator,bool> ret; pair<map<transponder_id_t, transponder>::iterator,bool> ret;
ret = transponders.insert ( ret = transponders.insert (
std::pair <transponder_id_t, transponder> ( tid, std::pair <transponder_id_t, transponder> (tid,
transponder (transport_stream_id, original_network_id, transponder(tid, feparams, polarization))
feparams, polarization)
)
); );
if (ret.second == false) if (ret.second == false)
printf("[zapit] duplicate transponder id %llx freq %d\n", tid, feparams.frequency); printf("[zapit] duplicate transponder id %llx freq %d\n", tid, feparams.frequency);
@@ -502,7 +500,7 @@ void CServiceManager::ParseSatTransponders(fe_type_t fType, xmlNodePtr search, t
polarization &= 1; polarization &= 1;
select_transponders.insert ( select_transponders.insert (
std::pair <transponder_id_t, transponder> (tid, std::pair <transponder_id_t, transponder> (tid,
transponder (fake_tid, fake_nid, feparams, polarization)) transponder (tid, feparams, polarization))
); );
fake_nid ++; fake_tid ++; fake_nid ++; fake_tid ++;

10
src/zapit/src/scan.cpp
View File

@@ -196,8 +196,7 @@ bool CServiceScan::AddTransponder(transponder_id_t TsidOnid, FrontendParameters
nittransponders.insert ( nittransponders.insert (
std::pair <transponder_id_t, transponder> ( std::pair <transponder_id_t, transponder> (
TsidOnid, TsidOnid,
transponder ( (TsidOnid >> 16) &0xFFFF, transponder (TsidOnid, *feparams, polarity)));
TsidOnid &0xFFFF, *feparams, polarity)));
} }
} }
else { else {
@@ -205,11 +204,11 @@ bool CServiceScan::AddTransponder(transponder_id_t TsidOnid, FrontendParameters
scantransponders.insert ( scantransponders.insert (
std::pair <transponder_id_t, transponder> ( std::pair <transponder_id_t, transponder> (
TsidOnid, TsidOnid,
transponder ( (TsidOnid >> 16) &0xFFFF, TsidOnid &0xFFFF, *feparams, polarity))); transponder(TsidOnid, *feparams, polarity)));
scanedtransponders.insert ( scanedtransponders.insert (
std::pair <transponder_id_t, transponder> ( std::pair <transponder_id_t, transponder> (
TsidOnid, TsidOnid,
transponder ( (TsidOnid >> 16) &0xFFFF, TsidOnid &0xFFFF, *feparams, polarity))); transponder(TsidOnid, *feparams, polarity)));
} }
return true; return true;
} }
@@ -320,8 +319,7 @@ _repeat:
std::pair <transponder_id_t, transponder> ( std::pair <transponder_id_t, transponder> (
TsidOnid, TsidOnid,
transponder ( transponder (
tI->second.transport_stream_id, TsidOnid,
tI->second.original_network_id,
tI->second.feparams, tI->second.feparams,
tI->second.polarization tI->second.polarization
) )