diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-06-28 16:48:18 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-06-28 16:48:18 +0000 |
| commit | c16d405383c4be419e4a88db6d02894b7cfbf74d (patch) | |
| tree | da2cd864e60eb417682dafa6b9b3ea33abdc21c3 /lib/dvb | |
| parent | e77fe4f47dc53fc7581746ec3670d38425e75439 (diff) | |
| download | enigma2-c16d405383c4be419e4a88db6d02894b7cfbf74d.tar.gz enigma2-c16d405383c4be419e4a88db6d02894b7cfbf74d.zip | |
move dvb-t 5V antenna switching to better place
rename Service Searchin -> Satconfig to -> Nimconfig
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/epgcache.cpp | 3 | ||||
| -rw-r--r-- | lib/dvb/frontend.cpp | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 56a6a61c..7c64fb0c 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -2366,8 +2366,7 @@ void eEPGCache::channel_data::readPrivateData( const __u8 *data) if (!isRunning) can_delete = 1; m_PrevVersion = (data[5] & 0x3E) >> 1; - m_PrivateReader->stop(); - startPrivateTimer.start(UPDATE_INTERVAL, 1); + startPrivateReader(); } } } diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 1040d7cd..352f3388 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1731,17 +1731,13 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) res=prepare_terrestrial(feparm); if (!res) { + std::string enable_5V; + char configStr[255]; + snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe); m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); - eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_PREV_PTR]; - if (linked_fe == (eDVBRegisteredFrontend*)-1) - { - std::string enable_5V; - ePythonConfigQuery::getConfigValue("config.terrestrial.enable_5V", enable_5V); - if (enable_5V == "yes") - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); - else - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) ); - } + ePythonConfigQuery::getConfigValue(configStr, enable_5V); + if (enable_5V == "on") + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); else m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) ); m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); |