X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dec9693d8437a31dab8e4010b33b57e1476a315c..e34d976be38fb06fb8819379198e89fb591d987f:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c2ddb409..0b1bdc2c 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -145,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;
 	}
@@ -466,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)
@@ -522,7 +523,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else if (m_boxtype == DM8000 || m_boxtype == DM7020HD)
+	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)
@@ -1792,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();