X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c4afca574ce3b3af434b458e52b61871eba5d31..5d71f584400a4302a391289bca750cdc16ed58cb:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 09c9f5f6..ad146542 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -52,6 +52,13 @@ RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
 	return -1;
 }
 
+ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
+{
+	ePtr<eDVBResourceManager> ptr;
+	eDVBResourceManager::getInstance(ptr);
+	return ptr;
+}
+
 eDVBResourceManager::eDVBResourceManager()
 	:m_releaseCachedChannelTimer(eApp)
 {
@@ -78,6 +85,14 @@ eDVBResourceManager::eDVBResourceManager()
 	CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
+void eDVBResourceManager::feStateChanged()
+{
+	int mask=0;
+	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+		if (i->m_inuse)
+			mask |= ( 1 << i->m_frontend->getID() );
+	/* emit */ frontendUseMaskChanged(mask);
+}
 
 DEFINE_REF(eDVBAdapterLinux);
 eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
@@ -207,14 +222,28 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 			m_demux.push_back(new eDVBRegisteredDemux(demux, adapter));
 	}
 
+	ePtr<eDVBRegisteredFrontend> prev_dvbt_frontend;
 	for (i=0; i<num_fe; ++i)
 	{
 		ePtr<eDVBFrontend> frontend;
-
 		if (!adapter->getFrontend(frontend, i))
 		{
+			int frontendType=0;
+			frontend->getFrontendType(frontendType);
+			eDVBRegisteredFrontend *new_fe = new eDVBRegisteredFrontend(frontend, adapter);
+			CONNECT(new_fe->stateChanged, eDVBResourceManager::feStateChanged);
+			m_frontend.push_back(new_fe);
 			frontend->setSEC(m_sec);
-			m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
+			// we must link all dvb-t frontends ( for active antenna voltage )
+			if (frontendType == iDVBFrontend::feTerrestrial)
+			{
+				if (prev_dvbt_frontend)
+				{
+					prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)new_fe);
+					frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)&(*prev_dvbt_frontend));
+				}
+				prev_dvbt_frontend = new_fe;
+			}
 		}
 	}
 }
@@ -489,7 +518,7 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
 	return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
+int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
 	ePtr<eDVBRegisteredFrontend> best;
 	int bestval = 0;
@@ -502,12 +531,12 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
 				bestval = c;
 		}
 
-	return bestval>0;
+	return bestval;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
+int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-	bool ret=true;
+	int ret=30000;
 	if (m_cached_channel)
 	{
 		eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
@@ -593,14 +622,14 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 	if (!m_list)
 	{
 		eDebug("no channel list set!");
-		ret = false;
+		ret = 0;
 		goto error;
 	}
 
 	if (m_list->getChannelFrontendData(channelid, feparm))
 	{
 		eDebug("channel not found!");
-		ret = false;
+		ret = 0;
 		goto error;
 	}
 
@@ -1181,7 +1210,7 @@ eCueSheet::eCueSheet()
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
 	{
-		eSingleLock l(m_lock);
+		eSingleLocker l(m_lock);
 		m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
 	}
 	m_event(evtSeek);
@@ -1189,14 +1218,14 @@ void eCueSheet::seekTo(int relative, const pts_t &pts)
 	
 void eCueSheet::clear()
 {
-	eSingleLock l(m_lock);
+	eSingleLocker l(m_lock);
 	m_spans.clear();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
 	{
-		eSingleLock l(m_lock);
+		eSingleLocker l(m_lock);
 		m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
 	}
 }
@@ -1209,7 +1238,7 @@ void eCueSheet::commitSpans()
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
 	{
-		eSingleLock l(m_lock);
+		eSingleLocker l(m_lock);
 		m_skipmode_ratio = ratio;
 	}
 	m_event(evtSkipmode);