X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6fdb2d2094c50a2bc324f4094473c2107d2ea943..97a429b6590d1bd7b925a445dc13dd769ba37235:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 21ebecf1..c2ddb409 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -98,6 +98,8 @@ eDVBResourceManager::eDVBResourceManager()
 		m_boxtype = DM500HD;
 	else if (!strncmp(tmp, "dm800se\n", rd))
 		m_boxtype = DM800SE;
+	else if (!strncmp(tmp, "dm7020hd\n", rd))
+		m_boxtype = DM7020HD;
 	else {
 		eDebug("boxtype detection via /proc/stb/info not possible... use fallback via demux count!\n");
 		if (m_demux.size() == 3)
@@ -108,7 +110,7 @@ eDVBResourceManager::eDVBResourceManager()
 			m_boxtype = DM8000;
 	}
 
-	eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d",
+	eDebug("found %zd adapter, %zd frontends(%zd sim) and %zd demux, boxtype %d",
 		m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype);
 
 	eDVBCAService::registerChannelCallback(this);
@@ -334,7 +336,7 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 	}
 	if (assigned != m_frontend.size()) {
 		char blasel[256];
-		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %zd socket informations, but %d registered frontends!",
 			m_frontend.size(), assigned);
 		PyErr_SetString(PyExc_StandardError, blasel);
 		return NULL;
@@ -520,7 +522,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else if (m_boxtype == DM8000)
+	else if (m_boxtype == DM8000 || m_boxtype == DM7020HD)
 	{
 		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
 		for (; i != m_demux.end(); ++i, ++n)
@@ -1488,7 +1490,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				size = max;
 			else
 				size = aligned_end - current_offset;
-			eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
+			eDebug("HIT, %lld < %lld < %lld, size: %zd", i->first, current_offset, i->second, size);
 			return;
 		}
 		if (current_offset < aligned_start)
@@ -1529,10 +1531,10 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 					len = aligned_end - aligned_start;
 
 				start = aligned_end - len;
-				eDebug("skipping to %llx, %d", start, len);
+				eDebug("skipping to %llx, %zd", start, len);
 			}
 
-			eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
+			eDebug("result: %llx, %zx (%llx %llx)", start, size, aligned_start, aligned_end);
 			return;
 		}
 	}
@@ -1548,7 +1550,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	{
 		start = current_offset;
 		size = max;
-		eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+		eDebug("NO CUESHEET. (%08llx, %zd)", start, size);
 	} else
 	{
 		start = current_offset;
@@ -1752,16 +1754,8 @@ RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &p
 
 RESULT eDVBChannel::playFile(const char *file)
 {
-	ASSERT(!m_frontend);
-	if (m_pvr_thread)
-	{
-		m_pvr_thread->stop();
-		delete m_pvr_thread;
-		m_pvr_thread = 0;
-	}
-
 	eRawFile *f = new eRawFile();
-	ePtr<iDataSource> source = f;
+	ePtr<iTsSource> source = f;
 
 	if (f->open(file) < 0)
 	{
@@ -1772,9 +1766,23 @@ RESULT eDVBChannel::playFile(const char *file)
 	return playSource(source, file);
 }
 
-RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *priv)
+RESULT eDVBChannel::playSource(ePtr<iTsSource> &source, const char *streaminfo_file)
 {
-	m_tstools.setSource(source, priv);
+	ASSERT(!m_frontend);
+	if (m_pvr_thread)
+	{
+		m_pvr_thread->stop();
+		delete m_pvr_thread;
+		m_pvr_thread = 0;
+	}
+
+	if (!source->valid())
+	{
+		eDebug("PVR source is not valid!");
+		return -ENOENT;
+	}
+
+	m_tstools.setSource(source, streaminfo_file);
 
 		/* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,
 		   THEN DO A REAL FIX HERE! */
@@ -1820,6 +1828,8 @@ void eDVBChannel::stopSource()
 	}
 	if (m_pvr_fd_dst >= 0)
 		::close(m_pvr_fd_dst);
+	ePtr<iTsSource> d;
+	m_tstools.setSource(d);
 }
 
 void eDVBChannel::stopFile()