X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=0b1bdc2c2a5b2d3c21be82fc4a56c2345b568731;hp=414ab8da7d9419f37b86d722bf7617523ccb3cea;hb=a4d95aed350cfe26a278ad7f9475bc8be77ff9ff;hpb=b3c4891fe653d87333ada5cb14c0bf102ac7b27a

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 414ab8d..0b1bdc2 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);
@@ -143,19 +145,20 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
 #endif
 		if (stat(filename, &s))
 			break;
-		ePtr<eDVBFrontend> fe;
+		eDVBFrontend *fe;
 
 		{
 			int ok = 0;
-			fe = new eDVBFrontend(m_nr, num_fe, ok);
+			fe = new eDVBFrontend(m_nr, num_fe, ok, true);
 			if (ok)
-				m_frontend.push_back(fe);
+				m_simulate_frontend.push_back(ePtr<eDVBFrontend>(fe));
 		}
+
 		{
 			int ok = 0;
-			fe = new eDVBFrontend(m_nr, num_fe, ok, true);
+			fe = new eDVBFrontend(m_nr, num_fe, ok, false, fe);
 			if (ok)
-				m_simulate_frontend.push_back(fe);
+				m_frontend.push_back(ePtr<eDVBFrontend>(fe));
 		}
 		++num_fe;
 	}
@@ -334,7 +337,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;
@@ -464,7 +467,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 
 	ePtr<eDVBRegisteredDemux> unused;
 
-	if (m_boxtype == DM800 || m_boxtype == DM500HD || m_boxtype == DM800SE) // dm800 / 500hd
+	if (m_boxtype == DM800) // dm800
 	{
 		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
 		for (; i != m_demux.end(); ++i, ++n)
@@ -520,7 +523,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else if (m_boxtype == DM8000)
+	else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE || m_boxtype == DM7020HD)
 	{
 		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
 		for (; i != m_demux.end(); ++i, ++n)
@@ -1488,7 +1491,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 +1532,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 +1551,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;
@@ -1790,14 +1793,28 @@ RESULT eDVBChannel::playSource(ePtr<iTsSource> &source, const char *streaminfo_f
 		/* (this codepath needs to be improved anyway.) */
 #if HAVE_DVB_API_VERSION < 3
 		m_pvr_fd_dst = open("/dev/pvr", O_WRONLY);
-#else
-		m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
-#endif
 		if (m_pvr_fd_dst < 0)
 		{
-			eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
+			eDebug("can't open /dev/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
 			return -ENODEV;
 		}
+#else
+		ePtr<eDVBAllocatedDemux> &demux = m_demux ? m_demux : m_decoder_demux;
+		if (demux)
+		{
+			m_pvr_fd_dst = demux->get().openDVR(O_WRONLY);
+			if (m_pvr_fd_dst < 0)
+			{
+				eDebug("can't open /dev/dvb/adapterX/dvrX - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
+				return -ENODEV;
+			}
+		}
+		else
+		{
+			eDebug("no demux allocated yet.. so its not possible to open the dvr device!!");
+			return -ENODEV;
+		}
+#endif
 	}
 
 	m_pvr_thread = new eDVBChannelFilePush();