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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 21ebecf1..399e9f58 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -464,7 +464,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 +520,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else if (m_boxtype == DM8000)
+	else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE)
 	{
 		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
 		for (; i != m_demux.end(); ++i, ++n)
@@ -1752,16 +1752,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 +1764,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! */
@@ -1784,14 +1790,28 @@ RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *priv)
 		/* (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();
@@ -1820,6 +1840,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()