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

unify transponder constructor

Browse Source 
Origin commit data
------------------
Commit: 73906e3591
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
This commit is contained in:
[CST] Focus
2012-04-10 13:42:52 +04:00
parent 443fe83b1f
commit 1a6d0b9abd
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,15 +45,6 @@ struct transponder
unsigned char polarization;
bool updated;
transponder (t_transport_stream_id p_transport_stream_id, struct dvb_frontend_parameters p_feparams)
{
transport_stream_id = p_transport_stream_id;
feparams = p_feparams;
polarization = 0;
original_network_id = 0;
updated = 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;
@@ -62,15 +53,6 @@ struct transponder
polarization = p_polarization;
updated = 0;
}
transponder (t_transport_stream_id p_transport_stream_id, struct dvb_frontend_parameters p_feparams, unsigned short p_polarization, t_original_network_id p_original_network_id)
{
transport_stream_id = p_transport_stream_id;
feparams = p_feparams;
polarization = p_polarization;
original_network_id = p_original_network_id;
updated = 0;
}
};
typedef std::map <transponder_id_t, transponder> transponder_list_t;

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

@@ -484,9 +484,9 @@ bool CServiceScan::ParseFnt(unsigned short pid, unsigned short operator_id)
TsidOnid,
transponder (
transport_stream_id,
original_network_id,
feparams,
polarization,
original_network_id
polarization
)
)
);

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

@@ -331,8 +331,8 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
ret = transponders.insert (
std::pair <transponder_id_t, transponder> ( tid,
transponder (transport_stream_id, feparams,
polarization, original_network_id)
transponder (transport_stream_id, original_network_id,
feparams, polarization)
)
);
if (ret.second == false)
@@ -502,8 +502,7 @@ void CServiceManager::ParseSatTransponders(fe_type_t fType, xmlNodePtr search, t
polarization &= 1;
select_transponders.insert (
std::pair <transponder_id_t, transponder> (tid,
transponder (fake_tid, feparams,
polarization, fake_nid))
transponder (fake_tid, fake_nid, feparams, polarization))
);
fake_nid ++; fake_tid ++;

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

@@ -321,9 +321,9 @@ _repeat:
TsidOnid,
transponder (
tI->second.transport_stream_id,
tI->second.original_network_id,
tI->second.feparams,
tI->second.polarization,
tI->second.original_network_id
tI->second.polarization
)
)
);