From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 13 Apr 2006 00:52:31 +0000 (+0000)
Subject: use refcount for decoding demuxes to check if they are in use
X-Git-Tag: 2.6.0~3626
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/73e8bb7046d631681fe42d8f56f486f7e36f52b7

use refcount for decoding demuxes to check if they are in use
---

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 18765ad3..2a188ee1 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -282,9 +282,14 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 	}
 	
 	for (; i != m_demux.end(); ++i, ++n)
-		if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
+	{
+		int is_decode = n < 2;
+		
+		int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse;
+		
+		if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 		{
-			if ((cap & iDVBChannel::capDecode) && (n >= 2))
+			if ((cap & iDVBChannel::capDecode) && !is_decode)
 				continue;
 			
 			demux = new eDVBAllocatedDemux(i);
@@ -294,6 +299,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 				demux->get().setSourcePVR(0);
 			return 0;
 		}
+	}
 	eDebug("demux not found");
 	return -1;
 }