X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d0d9ad2cf4891c5386a3d8ca040c2738b5c2532..73e392106d840775a16f2d1ff71a4bc0b1992b8f:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c3c0a026..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)
 {
@@ -529,7 +536,7 @@ int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
 
 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 +622,14 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
 	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 +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);
@@ -1211,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));
 	}
 }
@@ -1231,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);