X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b6592b47fa1932132a67a3beabcce7c96856d211..8f01a41693ff4b01a224e9ea2f9a26538ec20414:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c8feccfd..31cf7720 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 
 DEFINE_REF(eDVBRegisteredFrontend);
 DEFINE_REF(eDVBRegisteredDemux);
@@ -176,7 +177,6 @@ eDVBResourceManager::~eDVBResourceManager()
 {
 	if (instance == this)
 		instance = 0;
-
 }
 
 void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
@@ -288,7 +288,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 //		return errNoDemux;
 	
 	RESULT res;
-	eDVBChannel *ch;
+	ePtr<eDVBChannel> ch;
 	ch = new eDVBChannel(this, fe);
 
 	ePtr<iDVBFrontend> myfe;
@@ -346,7 +346,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
-	eDebug("add channel %p", ch);
 	m_active_channels.push_back(active_channel(chid, ch));
 	/* emit */ m_channelAdded(ch);
 	return 0;
@@ -404,7 +403,6 @@ eDVBChannel::~eDVBChannel()
 
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
-	eDebug("fe state changed!");
 	int state, ourstate = 0;
 	
 		/* if we are already in shutdown, don't change state. */
@@ -422,10 +420,14 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 	{
 		eDebug("OURSTATE: tuning");
 		ourstate = state_tuning;
-	} else if (state == iDVBFrontend::stateFailed)
+	} else if (state == iDVBFrontend::stateLostLock)
 	{
-		eDebug("OURSTATE: failed/unavailable");
+		eDebug("OURSTATE: lost lock");
 		ourstate = state_unavailable;
+	} else if (state == iDVBFrontend::stateFailed)
+	{
+		eDebug("OURSTATE: failed");
+		ourstate = state_failed;
 	} else
 		eFatal("state unknown");
 	
@@ -475,7 +477,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 		eDebug("channel not found!");
 		return -ENOENT;
 	}
-	eDebug("allocateChannel: channel found..");
 	
 	if (!m_frontend)
 	{
@@ -616,3 +617,52 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
 	
 	return 0;
 }
+
+RESULT eDVBChannel::seekTo(pts_t &pts)
+{
+#if 0
+	eDebug("eDVBChannel: seekTo .. %llx", pts);
+	m_pvr_thread->pause();
+	if (m_decoder_demux)
+		m_decoder_demux->get().flush();
+		/* demux will also flush all decoder.. */
+	
+	off_t r;
+	
+	if (!m_tstools.getPosition(pts, r));
+		m_pvr_thread->seek(r);
+	else
+		eDebug("getPosition failed!");
+	m_pvr_thread->resume();
+#endif
+}
+
+RESULT eDVBChannel::seekToPosition(int relative, const off_t &r)
+{
+			/* when seeking, we have to ensure that all buffers are flushed.
+			   there are basically 3 buffers:
+			   a.) the filepush's internal buffer
+			   b.) the PVR buffer (before demux)
+			   c.) the ratebuffer (after demux)
+			   
+			   it's important to clear them in the correct order, otherwise
+			   the ratebuffer (for example) would immediately refill from
+			   the not-yet-flushed PVR buffer.
+			*/
+	eDebug("eDVBChannel: seekToPosition .. %llx", r);
+	m_pvr_thread->pause();
+
+		/* flush internal filepush buffer */
+	m_pvr_thread->flush();
+
+		/* HACK: flush PVR buffer */
+	::ioctl(m_pvr_fd_dst, 0);
+	
+		/* flush ratebuffers (video, audio) */
+	if (m_decoder_demux)
+		m_decoder_demux->get().flush();
+
+		/* demux will also flush all decoder.. */
+	m_pvr_thread->seek(relative ? SEEK_CUR : SEEK_SET, r);
+	m_pvr_thread->resume();
+}