add ability to select in scan what is todo with existing services (Clear before scan)

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

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index bf0014d87e2fbf85d26f2c782e6a075333c65c3b..a6537e81d60d4a5bd05c122e8007f7e8044f98fd 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 
@@ -26,9 +25,15 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
+       /* these are quite new... */
+#ifndef AUDIO_GET_PTS
+#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
+#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
+#endif
+
 DEFINE_REF(eDVBAudio);
 
-eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
+eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -58,7 +63,7 @@ int eDVBAudio::startPid(int pid, int type)
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;
-       pes.pes_type = DMX_PES_AUDIO;  // DMX_PES_AUDIO0
+       pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */
        pes.flags    = 0;
        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {
@@ -131,7 +136,12 @@ void eDVBAudio::unfreeze()
        if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
                eDebug("video: AUDIO_CONTINUE: %m");
 }
-       
+
+int eDVBAudio::getPTS(pts_t &now)
+{
+       return ::ioctl(m_fd, AUDIO_GET_PTS, &now);
+}
+
 eDVBAudio::~eDVBAudio()
 {
        if (m_fd >= 0)
@@ -142,7 +152,7 @@ eDVBAudio::~eDVBAudio()
 
 DEFINE_REF(eDVBVideo);
 
-eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
+eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -153,6 +163,8 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
        m_fd = ::open(filename, O_RDWR);
        if (m_fd < 0)
                eWarning("%s: %m", filename);
+       
+       eDebug("Video Device: %s", filename);
 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
 #else
@@ -161,6 +173,7 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
        m_fd_demux = ::open(filename, O_RDWR);
        if (m_fd_demux < 0)
                eWarning("%s: %m", filename);
+       eDebug("demux device: %s", filename);
 }
        
 int eDVBVideo::startPid(int pid)
@@ -172,7 +185,7 @@ int eDVBVideo::startPid(int pid)
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;
-       pes.pes_type = DMX_PES_VIDEO;
+       pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */
        pes.flags    = 0;
        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {
@@ -237,6 +250,11 @@ int eDVBVideo::setFastForward(int skip)
        m_is_fast_forward = skip;
        return ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
 }
+
+int eDVBVideo::getPTS(pts_t &now)
+{
+       return ::ioctl(m_fd, VIDEO_GET_PTS, &now);
+}
        
 eDVBVideo::~eDVBVideo()
 {
@@ -301,9 +319,9 @@ eDVBPCR::~eDVBPCR()
                ::close(m_fd_demux);
 }
 
-DEFINE_REF(eDVBVText);
+DEFINE_REF(eDVBTText);
 
-eDVBVText::eDVBVText(eDVBDemux *demux): m_demux(demux)
+eDVBTText::eDVBTText(eDVBDemux *demux): m_demux(demux)
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -316,7 +334,7 @@ eDVBVText::eDVBVText(eDVBDemux *demux): m_demux(demux)
                eWarning("%s: %m", filename);
 }
 
-int eDVBVText::startPid(int pid)
+int eDVBTText::startPid(int pid)
 {
        if (m_fd_demux < 0)
                return -1;
@@ -340,13 +358,13 @@ int eDVBVText::startPid(int pid)
        return 0;
 }
 
-void eDVBVText::stop()
+void eDVBTText::stop()
 {
        if (::ioctl(m_fd_demux, DMX_STOP) < 0)
                eWarning("video: DMX_STOP: %m");
 }
 
-eDVBVText::~eDVBVText()
+eDVBTText::~eDVBTText()
 {
        if (m_fd_demux >= 0)
                ::close(m_fd_demux);
@@ -359,10 +377,14 @@ int eTSMPEGDecoder::setState()
        int res = 0;
        
        int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
+       int nott = noaudio; /* actually same conditions */
        
        if ((noaudio && m_audio) || (!m_audio && !noaudio))
                m_changed |= changeAudio;
        
+       if ((nott && m_text) || (!m_text && !nott))
+               m_changed |= changeText;
+       
 #if HAVE_DVB_API_VERSION < 3
        if (m_changed & changeAudio && m_audio)
                m_audio->stopPid();
@@ -395,7 +417,7 @@ int eTSMPEGDecoder::setState()
        }
        if (m_changed & changeVideo)
        {
-               m_video = new eDVBVideo(m_demux, 0);
+               m_video = new eDVBVideo(m_demux, m_decoder);
                if (m_video->startPid(m_vpid))
                {
                        eWarning("video: startpid failed!");
@@ -405,7 +427,7 @@ int eTSMPEGDecoder::setState()
        }
        if (m_changed & changeAudio)
        {
-               m_audio = new eDVBAudio(m_demux, 0);
+               m_audio = new eDVBAudio(m_demux, m_decoder);
                if (m_audio->startPid(m_apid, m_atype))
                {
                        eWarning("audio: startpid failed!");
@@ -442,7 +464,7 @@ int eTSMPEGDecoder::setState()
                if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
                {
                        eDebug("new video");
-                       m_video = new eDVBVideo(m_demux, 0);
+                       m_video = new eDVBVideo(m_demux, m_decoder);
                        if (m_video->startPid(m_vpid))
                        {
                                eWarning("video: startpid failed!");
@@ -458,7 +480,7 @@ int eTSMPEGDecoder::setState()
                m_audio = 0;
                if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio)
                {
-                       m_audio = new eDVBAudio(m_demux, 0);
+                       m_audio = new eDVBAudio(m_demux, m_decoder);
                        if (m_audio->startPid(m_apid, m_atype))
                        {
                                eWarning("audio: startpid failed!");
@@ -472,9 +494,9 @@ int eTSMPEGDecoder::setState()
                if (m_text)
                        m_text->stop();
                m_text = 0;
-               if ((m_textpid >= 0) && (m_textpid < 0x1FFF))
+               if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
                {
-                       m_text = new eDVBVText(m_demux);
+                       m_text = new eDVBTText(m_demux);
                        if (m_text->startPid(m_textpid))
                        {
                                eWarning("text: startpid failed!");
@@ -487,7 +509,7 @@ int eTSMPEGDecoder::setState()
        return res;
 }
 
-eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0)
+eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0), m_decoder(decoder)
 {
        demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
        m_is_ff = m_is_sm = m_is_trickmode = 0;
@@ -639,3 +661,27 @@ RESULT eTSMPEGDecoder::setTrickmode(int what)
        setState();
        return 0;
 }
+
+RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
+{
+       if (what == 0) /* auto */
+               what = m_video ? 1 : 2;
+
+       if (what == 1) /* video */
+       {
+               if (m_video)
+                       return m_video->getPTS(pts);
+               else
+                       return -1;
+       }
+
+       if (what == 2) /* audio */
+       {
+               if (m_audio)
+                       return m_audio->getPTS(pts);
+               else
+                       return -1;
+       }
+
+       return -1;
+}