aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-17 12:58:46 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-17 12:58:46 +0000
commitde62aa9ce9d8b1ff8ffe12b334e68802c120e35b (patch)
treef3c8295ddf21c28b71ce9bfd080c4d9a177dc48d /lib/dvb
parent2601ee77efe1f10be7cbeb8af94e2fb229cc1ec1 (diff)
downloadenigma2-de62aa9ce9d8b1ff8ffe12b334e68802c120e35b.tar.gz
enigma2-de62aa9ce9d8b1ff8ffe12b334e68802c120e35b.zip
use fec from satellites.xml,
small work on scan
Diffstat (limited to 'lib/dvb')
-rw-r--r--lib/dvb/frontend.cpp5
-rw-r--r--lib/dvb/frontendparms.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 0bfb1f51..103d8949 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -177,8 +177,11 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
diff = 1<<29;
else if (sat.polarisation != osat.polarisation)
diff = 1<<28;
- else
+ else
+ {
diff = abs(sat.frequency - osat.frequency);
+ diff += abs(sat.symbol_rate - osat.symbol_rate);
+ }
return 0;
}
case iDVBFrontend::feCable:
diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index e98b6dbf..5ce1100b 100644
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -22,7 +22,7 @@ struct eDVBFrontendParametersSatellite
struct FEC
{
enum {
- fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+ fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, fNone
};
};
unsigned int frequency, symbol_rate;