X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68794a76cf18bbf9fd6970bdce4e5074896129c7..9e4a418c7ce0e0281ca8c06be4ee92a48eaab87a:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 4a6da016..0eb614db 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -2,6 +2,7 @@
 #include <lib/base/filepush.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
+#include <lib/dvb/pmt.h>
 #include <lib/dvb/sec.h>
 
 #include <errno.h>
@@ -82,6 +83,8 @@ eDVBResourceManager::eDVBResourceManager()
 	eDebug("found %d adapter, %d frontends and %d demux", 
 		m_adapter.size(), m_frontend.size(), m_demux.size());
 
+	eDVBCAService::registerChannelCallback(this);
+
 	CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
@@ -277,31 +280,42 @@ RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, eP
 {
 	ePtr<eDVBRegisteredFrontend> best;
 	int bestval = 0;
+	int foundone = 0;
 
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+	{
+		int c = i->m_frontend->isCompatibleWith(feparm);
+
+		if (c)	/* if we have at least one frontend which is compatible with the source, flag this. */
+			foundone = 1;
+
 		if (!i->m_inuse)
 		{
-			int c = i->m_frontend->isCompatibleWith(feparm);
 			if (c > bestval)
 			{
 				bestval = c;
 				best = i;
 			}
 		}
+	}
 
 	if (best)
 	{
 		fe = new eDVBAllocatedFrontend(best);
 		return 0;
 	}
-	
+
 	fe = 0;
-	
-	return -1;
+
+	if (foundone)
+		return errAllSourcesBusy;
+	else
+		return errNoSourceFound;
 }
 
 RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index)
 {
+	int err = errNoSourceFound;
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
 		if (!i->m_inuse && i->m_frontend->getSlotID() == slot_index)
 		{
@@ -313,6 +327,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 				if (satpos_depends_to_fe->m_inuse)
 				{
 					eDebug("another satpos depending frontend is in use.. so allocateFrontendByIndex not possible!");
+					err = errAllSourcesBusy;
 					goto alloc_fe_by_id_not_possible;
 				}
 			}
@@ -325,6 +340,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 					if (next->m_inuse)
 					{
 						eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+						err = errAllSourcesBusy;
 						goto alloc_fe_by_id_not_possible;
 					}
 					next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
@@ -336,6 +352,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 					if (prev->m_inuse)
 					{
 						eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+						err = errAllSourcesBusy;
 						goto alloc_fe_by_id_not_possible;
 					}
 					prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
@@ -346,7 +363,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 		}
 alloc_fe_by_id_not_possible:
 	fe = 0;
-	return -1;
+	return err;
 }
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
@@ -444,22 +461,23 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 	if (!m_list)
 	{
 		eDebug("no channel list set!");
-		return -ENOENT;
+		return errNoChannelList;
 	}
 
 	ePtr<iDVBFrontendParameters> feparm;
 	if (m_list->getChannelFrontendData(channelid, feparm))
 	{
 		eDebug("channel not found!");
-		return -ENOENT;
+		return errChannelNotInList;
 	}
 
 	/* allocate a frontend. */
 	
 	ePtr<eDVBAllocatedFrontend> fe;
-	
-	if (allocateFrontend(fe, feparm))
-		return errNoFrontend;
+
+	int err = allocateFrontend(fe, feparm);
+	if (err)
+		return err;
 
 	RESULT res;
 	ePtr<eDVBChannel> ch;
@@ -519,9 +537,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 		m_releaseCachedChannelTimer.stop();
 	}
 
-	if (allocateFrontendByIndex(fe, slot_index))
-		return errNoFrontend;
-	
+	int err = allocateFrontendByIndex(fe, slot_index);
+	if (err)
+		return err;
+
 	eDVBChannel *ch;
 	ch = new eDVBChannel(this, fe);
 
@@ -594,14 +613,41 @@ int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
 	return bestval;
 }
 
+int tuner_type_channel_default(ePtr<iDVBChannelList> &channellist, const eDVBChannelID &chid)
+{
+	if (channellist)
+	{
+		ePtr<iDVBFrontendParameters> feparm;
+		if (!channellist->getChannelFrontendData(chid, feparm))
+		{
+			int system;
+			if (!feparm->getSystem(system))
+			{
+				switch(system)
+				{
+					case iDVBFrontend::feSatellite:
+						return 50000;
+					case iDVBFrontend::feCable:
+						return 40000;
+					case iDVBFrontend::feTerrestrial:
+						return 30000;
+					default:
+						break;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
 int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-	int ret=30000;
+	int ret=0;
 	if (m_cached_channel)
 	{
 		eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
 		if(channelid==cache_chan->getChannelID())
-			return ret;
+			return tuner_type_channel_default(m_list, channelid);
 	}
 
 		/* first, check if a channel is already existing. */
@@ -612,7 +658,7 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
 		if (i->m_channel_id == channelid)
 		{
 //			eDebug("found shared channel..");
-			return ret;
+			return tuner_type_channel_default(m_list, channelid);
 		}
 	}
 
@@ -682,14 +728,12 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
 	if (!m_list)
 	{
 		eDebug("no channel list set!");
-		ret = 0;
 		goto error;
 	}
 
 	if (m_list->getChannelFrontendData(channelid, feparm))
 	{
 		eDebug("channel not found!");
-		ret = 0;
 		goto error;
 	}
 
@@ -922,6 +966,7 @@ void eDVBChannel::cueSheetEvent(int event)
 				m_skipmode_n = m_skipmode_m = 0;
 			}
 		}
+		ASSERT(m_pvr_thread);
 		m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
 		eDebug("flush pvr");
 		flushPVR(m_cue->m_decoding_demux);