X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=516294523be74848efe99c80952296adf628a58a;hp=6eaadb04db8de3f737c906c7c12bd2930c5aac6d;hb=4cf4560a3dfc1a18f4bc894e153dc501965f4b0f;hpb=c352487661e7927d0068ef8fa69765055ff488d8

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6eaadb0..5162945 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -96,6 +96,8 @@ eDVBResourceManager::eDVBResourceManager()
 		m_boxtype = DM800;
 	else if (!strncmp(tmp, "dm500hd\n", rd))
 		m_boxtype = DM500HD;
+	else if (!strncmp(tmp, "dm800se\n", rd))
+		m_boxtype = DM800SE;
 	else {
 		eDebug("boxtype detection via /proc/stb/info not possible... use fallback via demux count!\n");
 		if (m_demux.size() == 3)
@@ -318,27 +320,34 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 		PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
 		return NULL;
 	}
-	if ((unsigned int)PyList_Size(list) != m_frontend.size())
+	unsigned int assigned=0;
+	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
 	{
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			++assigned;
+			break;
+		}
+	}
+	if (assigned != m_frontend.size()) {
 		char blasel[256];
-		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
-			m_frontend.size(), PyList_Size(list));
+		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+			m_frontend.size(), assigned);
 		PyErr_SetString(PyExc_StandardError, blasel);
 		return NULL;
 	}
-	int pos=0;
-	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
-	}
-	pos=0;
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_simulate_frontend.begin()); i != m_simulate_frontend.end(); ++i)
 	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			break;
+		}
 	}
 	Py_RETURN_NONE;
 }
@@ -455,7 +464,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 
 	ePtr<eDVBRegisteredDemux> unused;
 
-	if (m_boxtype == DM800 || m_boxtype == DM500HD) // dm800 / 500hd
+	if (m_boxtype == DM800 || m_boxtype == DM500HD || m_boxtype == DM800SE) // dm800 / 500hd
 	{
 		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
 		for (; i != m_demux.end(); ++i, ++n)
@@ -1324,16 +1333,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		return;
 	}
 
-	m_cue->m_lock.RdLock();
-	if (!m_cue->m_decoding_demux)
-	{
-		start = current_offset;
-		size = max;
-		eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
-		m_cue->m_lock.Unlock();
-		return;
-	}
-
 	if (m_skipmode_n)
 	{
 		eDebug("skipmode %d:%d (x%d)", m_skipmode_m, m_skipmode_n, m_skipmode_frames);
@@ -1341,7 +1340,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	}
 
 	eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
-	
 	int frame_skip_success = 0;
 
 	if (m_skipmode_m)
@@ -1386,6 +1384,8 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		}
 	}
 
+	m_cue->m_lock.RdLock();
+
 	while (!m_cue->m_seek_requests.empty())
 	{
 		std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
@@ -1410,6 +1410,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				eDebug("decoder getPTS failed, can't seek relative");
 				continue;
 			}
+			if (!m_cue->m_decoding_demux)
+			{
+				eDebug("getNextSourceSpan, no decoding demux. couldn't seek to %llx... ignore request!", pts);
+				start = current_offset;
+				size = max;
+				continue;
+			}
 			if (getCurrentPosition(m_cue->m_decoding_demux, now, 1))
 			{
 				eDebug("seekTo: getCurrentPosition failed!");
@@ -1659,6 +1666,18 @@ void eDVBChannel::SDTready(int result)
 	m_SDT = 0;
 }
 
+int eDVBChannel::reserveDemux()
+{
+	ePtr<iDVBDemux> dmx;
+	if (!getDemux(dmx, 0))
+	{
+		uint8_t id;
+		if (!dmx->getCADemuxID(id))
+			return id;
+	}
+	return -1;
+}
+
 RESULT eDVBChannel::requestTsidOnid(ePyObject callback)
 {
 	if (PyCallable_Check(callback))