mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix cable nit

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

This should fix possible unintended multiple scans.
This commit is contained in:
TangoCash
2017-12-07 00:02:20 +01:00
committed by Thilo Graf
parent 5955e2b80a
commit 29cce3fca8
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/zapit/src/transponder.cpp
View File

@@ -50,24 +50,33 @@ transponder::transponder()
bool transponder::operator==(const transponder& t) const bool transponder::operator==(const transponder& t) const
{ {
if (!CFrontend::isTerr(feparams.delsys)) if (CFrontend::isSat(feparams.delsys))
return ( return (
(satellitePosition == t.satellitePosition) && (satellitePosition == t.satellitePosition) &&
//(transport_stream_id == t.transport_stream_id) && //(transport_stream_id == t.transport_stream_id) &&
//(original_network_id == t.original_network_id) && //(original_network_id == t.original_network_id) &&
((getFEParams()->polarization & 1) == (t.getFEParams()->polarization & 1)) && ((getFEParams()->polarization & 1) == (t.getFEParams()->polarization & 1)) &&
(abs((int) getFEParams()->frequency - (int)t.getFEParams()->frequency) <= 3000) && (abs((int) getFEParams()->frequency - (int)t.getFEParams()->frequency) <= 3000) &&
(getFEParams()->plp_id == t.getFEParams()->plp_id) && (getFEParams()->plp_id == t.getFEParams()->plp_id) &&
(getFEParams()->pls_mode == t.getFEParams()->pls_mode) && (getFEParams()->pls_mode == t.getFEParams()->pls_mode) &&
(getFEParams()->pls_code == t.getFEParams()->pls_code) (getFEParams()->pls_code == t.getFEParams()->pls_code)
); );
return ((satellitePosition == t.satellitePosition) && else if (CFrontend::isTerr(feparams.delsys))
return ((satellitePosition == t.satellitePosition) &&
//(transport_stream_id == t.transport_stream_id) && //(transport_stream_id == t.transport_stream_id) &&
//(original_network_id == t.original_network_id) && //(original_network_id == t.original_network_id) &&
((getFEParams()->polarization & 1) == (t.getFEParams()->polarization & 1)) && ((getFEParams()->polarization & 1) == (t.getFEParams()->polarization & 1)) &&
(abs((int) getFEParams()->frequency - (int)t.getFEParams()->frequency) <= 100) && (abs((int) getFEParams()->frequency - (int)t.getFEParams()->frequency) <= 100) &&
(getFEParams()->plp_id == t.getFEParams()->plp_id) (getFEParams()->plp_id == t.getFEParams()->plp_id)
); );
else
return (
(satellitePosition == t.satellitePosition) &&
//(transport_stream_id == t.transport_stream_id) &&
//(original_network_id == t.original_network_id) &&
((getFEParams()->polarization & 1) == (t.getFEParams()->polarization & 1)) &&
(abs((int) getFEParams()->frequency - (int)t.getFEParams()->frequency) <= 3000)
);
} }
bool transponder::compare(const transponder& t) const bool transponder::compare(const transponder& t) const