diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-13 16:17:19 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-13 16:17:19 +0000 |
| commit | 7f19468027d025ce8597318e7211995871f17376 (patch) | |
| tree | c3ac6a0da86f6ac005da99c563f01c6cd9e34a09 /lib/dvb/db.cpp | |
| parent | d561af52afdde1060b5a83ef17c4241e730d6cc6 (diff) | |
| download | enigma2-7f19468027d025ce8597318e7211995871f17376.tar.gz enigma2-7f19468027d025ce8597318e7211995871f17376.zip | |
make enigma2 ready for dvb-s2
Diffstat (limited to 'lib/dvb/db.cpp')
| -rw-r--r-- | lib/dvb/db.cpp | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index 65b37862..22b6267b 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -300,8 +300,11 @@ void eDVBDB::reloadServicelist() if (line[1]=='s') { eDVBFrontendParametersSatellite sat; - int frequency, symbol_rate, polarisation, fec, orbital_position, inversion; - sscanf(line+2, "%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion); + int frequency, symbol_rate, polarisation, fec, orbital_position, inversion, + system=eDVBFrontendParametersSatellite::System::DVB_S, + modulation=eDVBFrontendParametersSatellite::Modulation::QPSK, + rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto; + sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff); sat.frequency = frequency; sat.symbol_rate = symbol_rate; sat.polarisation = polarisation; @@ -309,6 +312,9 @@ void eDVBDB::reloadServicelist() sat.orbital_position = orbital_position < 0 ? orbital_position + 3600 : orbital_position; sat.inversion = inversion; + sat.system = system; + sat.modulation = modulation; + sat.roll_off = rolloff; feparm->setDVBS(sat); } else if (line[1]=='t') { @@ -452,11 +458,25 @@ void eDVBDB::saveServicelist() eDVBFrontendParametersCable cab; if (!ch.m_frontendParameters->getDVBS(sat)) { - fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", - sat.frequency, sat.symbol_rate, - sat.polarisation, sat.fec, - sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, - sat.inversion); + if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2) + { + fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n", + sat.frequency, sat.symbol_rate, + sat.polarisation, sat.fec, + sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, + sat.inversion, + sat.system, + sat.modulation, + sat.roll_off); + } + else + { + fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", + sat.frequency, sat.symbol_rate, + sat.polarisation, sat.fec, + sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, + sat.inversion); + } } if (!ch.m_frontendParameters->getDVBT(ter)) { |