fix marking non playable services in channellist

4 files changed, 45 insertions, 24 deletions

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 38a062a2..658c5866 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/epgcache.h>
 #include <lib/base/eerror.h>
@@ -154,6 +155,21 @@ RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
 	return eEPGCache::getInstance()->lookupEventTime(ref, t, ptr);
 }
 
+bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+{
+	ePtr<eDVBResourceManager> res_mgr;
+	if ( eDVBResourceManager::getInstance( res_mgr ) )
+		eDebug("isPlayble... no res manager!!");
+	else
+	{
+		eDVBChannelID chid, chid_ignore;
+		((const eServiceReferenceDVB&)ref).getChannelID(chid);
+		((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
+		return res_mgr->canAllocateChannel(chid, chid_ignore);
+	}
+	return false;
+}
+
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
 {
 	int res = 0;
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 4107c22d..aa795812 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -406,14 +406,13 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
 	return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask)
+bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
-	eDebug("canAllocateFrontend mask %08x", used_tuner_mask);
 	ePtr<eDVBRegisteredFrontend> best;
 	int bestval = 0;
 
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-		if ( !(used_tuner_mask & (1<<i->m_frontend->getID())) )
+		if (!i->m_inuse)
 		{
 			int c = i->m_frontend->isCompatibleWith(feparm);
 			if (c > bestval)
@@ -423,16 +422,11 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
 	return bestval>0;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
+bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-	return true;
-#if 0
-	int used_tuner_mask=0;
-
 		/* first, check if a channel is already existing. */
 //	eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
-	int cnt=0;
-	for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i, ++cnt)
+	for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
 	{
 //		eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
 		if (i->m_channel_id == channelid)
@@ -440,28 +434,33 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
 //			eDebug("found shared channel..");
 			return true;
 		}
+	}
+
+	int *decremented_fe_usecount=NULL;
 
-		eDebug("activeChannel %d, NonDecoderDemux %p, DecoderDemux %p",
-			cnt, i->m_channel->getNonDecoderDemux(), i->m_channel->getDecoderDemux() );
-		if ( i->m_channel->getNonDecoderDemux() )
+	for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+	{
+//		eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
+		if (i->m_channel_id == ignore)
 		{
-			ePtr<iDVBFrontend> fe;
-			if (!i->m_channel->getFrontend(fe))
+			eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
+			if (channel->getUseCount() == 1)  // channel only used once..
 			{
-				if (fe)
+				ePtr<iDVBFrontend> fe;
+				if (!i->m_channel->getFrontend(fe))
 				{
 					for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
 					{
 						if ( &(*fe) == &(*ii->m_frontend) )
 						{
-							used_tuner_mask |= (1 << ii->m_frontend->getID());
+							--ii->m_inuse;
+							decremented_fe_usecount = &ii->m_inuse;
 							break;
 						}
 					}
 				}
-				else
-					eDebug("fe kaputt");
 			}
+			break;
 		}
 	}
 
@@ -478,8 +477,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
 		return false;
 	}
 
-	return canAllocateFrontend(feparm, used_tuner_mask);
-#endif
+	bool ret = canAllocateFrontend(feparm);
+
+	if (decremented_fe_usecount)
+		++(*decremented_fe_usecount);
+
+	return ret;
 }
 
 DEFINE_REF(eDVBChannel);
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 5c3c5150..6a9e6330 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -142,7 +142,7 @@ class eDVBResourceManager: public iObject
 	Signal1<void,eDVBChannel*> m_channelRemoved;
 	Signal1<void,iDVBChannel*> m_channelRunning;
 
-	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask);
+	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 public:
 	eDVBResourceManager();
 	virtual ~eDVBResourceManager();
@@ -167,7 +167,7 @@ public:
 	RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
 	RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
 
-	bool canAllocateChannel(const eDVBChannelID &channelid);
+	bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 };
 
 class eFilePushThread;
@@ -201,6 +201,7 @@ public:
 			   there is an unknown amount of buffers in between */
 	RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
 
+	int getUseCount() { return m_use_count; }
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;
 	ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c7e22397..a14e0af5 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -219,7 +219,8 @@ public:
 	// iStaticServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr);
-	
+	bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+
 		/* for filtering: */
 	int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };