add return code

[enigma2.git] / lib / dvb / dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index a2a37758c37cdda449bf5f14a4cced62503e4fdf..78cef639263b79046176c181e29618e52146ac1f 100644 (file)
--- 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);
@@ -634,15 +635,36 @@ RESULT eDVBChannel::seekTo(pts_t &pts)
                eDebug("getPosition failed!");
        m_pvr_thread->resume();
 #endif
+       return 0;
 }
 
 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();
+       return 0;
 }