diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-24 03:47:26 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-24 03:47:26 +0000 |
| commit | 9b1c4b296ae2f83c62cb83c5babfc35cbc3d52f7 (patch) | |
| tree | 06ec16f7b7e2e4c40088db22282579ea12dcfe31 /lib | |
| parent | d030fb234d74f1375bd318379ec5d2f643344839 (diff) | |
| download | enigma2-9b1c4b296ae2f83c62cb83c5babfc35cbc3d52f7.tar.gz enigma2-9b1c4b296ae2f83c62cb83c5babfc35cbc3d52f7.zip | |
loading and saving the cable transponders to lamedb works now
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb/db.cpp | 14 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index 57916146..2d609bdc 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -318,9 +318,15 @@ void eDVBDB::reloadServicelist() feparm->setDVBT(ter); } else if (line[1]=='c') { + eDVBFrontendParametersCable cab; int frequency, symbol_rate, inversion=0, modulation=3; sscanf(line+2, "%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation); -// t.setCable(frequency, symbol_rate, inversion, modulation); + cab.frequency = frequency; + cab.symbol_rate = symbol_rate; + cab.modulation = modulation; + cab.fec_inner = 6; + cab.inversion = inversion; + feparm->setDVBC(cab); } } addChannelToList(channelid, feparm); @@ -431,6 +437,7 @@ void eDVBDB::saveServicelist() chid.transport_stream_id.get(), chid.original_network_id.get()); eDVBFrontendParametersSatellite sat; eDVBFrontendParametersTerrestrial ter; + eDVBFrontendParametersCable cab; if (!ch.m_frontendParameters->getDVBS(sat)) { fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", @@ -446,6 +453,11 @@ void eDVBDB::saveServicelist() ter.code_rate_LP, ter.modulation, ter.transmission_mode, ter.guard_interval, ter.hierarchy, ter.inversion); } + if (!ch.m_frontendParameters->getDVBC(cab)) + { + fprintf(f, "\tc %d:%d:%d:%d\n", + cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation); + } fprintf(f, "/\n"); channels++; } diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index cd9a8f94..2755e317 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -36,11 +36,9 @@ def getInitialCableTransponderList(tlist, cable): parm = eDVBFrontendParametersCable() parm.frequency = x[1] parm.symbol_rate = x[2] - parm.modulation = 2 # x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti - parm.fec = 6# x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; - #parm.fec = 6 # AUTO + parm.modulation = 5 # AUTO + parm.fec_inner = 6 # AUTO parm.inversion = 2 # AUTO - #parm.inversion = 2 #AUTO tlist.append(parm) class ScanSetup(Screen): |