X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8fc0752931ad7a8efa802b0a0f0246a2b50eca6b..477c468861635555c7179f2f4397dd765f499656:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 601e6279..8f4022ec 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -43,6 +43,7 @@ DEFINE_REF(eDVBResourceManager);
 eDVBResourceManager *eDVBResourceManager::instance;
 
 eDVBResourceManager::eDVBResourceManager()
+	:m_releaseCachedChannelTimer(eApp)
 {
 	avail = 1;
 	busy = 0;
@@ -63,6 +64,8 @@ eDVBResourceManager::eDVBResourceManager()
 	
 	eDebug("found %d adapter, %d frontends and %d demux", 
 		m_adapter.size(), m_frontend.size(), m_demux.size());
+
+	CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
 
@@ -355,10 +358,41 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 		return errChidNotFound;
 	}
 	m_cached_channel = channel = ch;
+	CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
 
 	return 0;
 }
 
+void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
+{
+	int state=0;
+	chan->getState(state);
+	switch (state)
+	{
+		case iDVBChannel::state_release:
+		case iDVBChannel::state_ok:
+		{
+			eDebug("stop release channel timer");
+			m_releaseCachedChannelTimer.stop();
+			break;
+		}
+		case iDVBChannel::state_last_instance:
+		{
+			eDebug("start release channel timer");
+			m_releaseCachedChannelTimer.start(3000, true);
+			break;
+		}
+		default: // ignore all other events
+			break;
+	}
+}
+
+void eDVBResourceManager::releaseCachedChannel()
+{
+	eDebug("release cached channel");
+	m_cached_channel=0;
+}
+
 RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
 {
 	ePtr<eDVBAllocatedFrontend> fe;
@@ -780,7 +814,11 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 
 void eDVBChannel::AddUse()
 {
-	++m_use_count;
+	if (++m_use_count > 1 && m_state == state_last_instance)
+	{
+		m_state = state_ok;
+		m_stateChanged(this);
+	}
 }
 
 void eDVBChannel::ReleaseUse()
@@ -790,6 +828,11 @@ void eDVBChannel::ReleaseUse()
 		m_state = state_release;
 		m_stateChanged(this);
 	}
+	else if (m_use_count == 1)
+	{
+		m_state = state_last_instance;
+		m_stateChanged(this);
+	}
 }
 
 RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontendParameters> &feparm)