diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-11-09 17:31:11 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-11-09 17:31:11 +0000 |
| commit | c2f1a638b1eb861d1a8e97530adfcefd65ff6ac0 (patch) | |
| tree | e9dcd978df830b03690a5502362275dc666bddbc /lib/dvb/dvb.cpp | |
| parent | efd666f5dfe5a6d355d0ba60683c9457714f75e9 (diff) | |
| download | enigma2-c2f1a638b1eb861d1a8e97530adfcefd65ff6ac0.tar.gz enigma2-c2f1a638b1eb861d1a8e97530adfcefd65ff6ac0.zip | |
differentiate between failures while and after tuning
Diffstat (limited to 'lib/dvb/dvb.cpp')
| -rw-r--r-- | lib/dvb/dvb.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 35e5c993..13ae224c 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -176,7 +176,6 @@ eDVBResourceManager::~eDVBResourceManager() { if (instance == this) instance = 0; - } void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) @@ -288,7 +287,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse // return errNoDemux; RESULT res; - eDVBChannel *ch; + ePtr<eDVBChannel> ch; ch = new eDVBChannel(this, fe); ePtr<iDVBFrontend> myfe; @@ -346,7 +345,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel) RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch) { - eDebug("add channel %p", ch); m_active_channels.push_back(active_channel(chid, ch)); /* emit */ m_channelAdded(ch); return 0; @@ -404,7 +402,6 @@ eDVBChannel::~eDVBChannel() void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) { - eDebug("fe state changed!"); int state, ourstate = 0; /* if we are already in shutdown, don't change state. */ @@ -422,10 +419,14 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) { eDebug("OURSTATE: tuning"); ourstate = state_tuning; - } else if (state == iDVBFrontend::stateFailed) + } else if (state == iDVBFrontend::stateLostLock) { - eDebug("OURSTATE: failed/unavailable"); + eDebug("OURSTATE: lost lock"); ourstate = state_unavailable; + } else if (state == iDVBFrontend::stateFailed) + { + eDebug("OURSTATE: failed"); + ourstate = state_failed; } else eFatal("state unknown"); @@ -475,7 +476,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) eDebug("channel not found!"); return -ENOENT; } - eDebug("allocateChannel: channel found.."); if (!m_frontend) { |