X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8b6a8658b1ea5aa358947a488c80eff75295d0fb..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index ff3e4712..ecb0ec6e 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -511,7 +511,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;
@@ -524,12 +524,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);
@@ -615,14 +615,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;
 	}
 
@@ -1203,7 +1203,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);
@@ -1211,14 +1211,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));
 	}
 }
@@ -1231,7 +1231,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);