replace software update plugin with a more user friendly approach

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

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index a6b0ccb2d6d75d997baf2e08a9513c9e24e596da..b9acabade0b14c7d01c0da6c4f44494fa2408d37 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,3 +1,4 @@
+#include <lib/base/ebase.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 
@@ -9,8 +10,10 @@
 #define videoStreamSource_t video_stream_source_t
 #define streamSource stream_source
 #define dmxPesFilterParams dmx_pes_filter_params
-#define DMX_PES_VIDEO DMX_PES_VIDEO0
-#define DMX_PES_AUDIO DMX_PES_AUDIO0
+#define DMX_PES_VIDEO0 DMX_PES_VIDEO
+#define DMX_PES_AUDIO0 DMX_PES_AUDIO
+#define DMX_PES_VIDEO1 DMX_PES_VIDEO
+#define DMX_PES_AUDIO1 DMX_PES_AUDIO
 #include <ost/dmx.h>
 #include <ost/video.h>
 #include <ost/audio.h>
@@ -176,7 +179,11 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
        m_fd = ::open(filename, O_RDWR);
        if (m_fd < 0)
                eWarning("%s: %m", filename);
-       
+       else
+       {
+               m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Priority);
+               CONNECT(m_sn->activated, eDVBVideo::video_event);
+       }
        eDebug("Video Device: %s", filename);
 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
@@ -279,6 +286,8 @@ int eDVBVideo::getPTS(pts_t &now)
        
 eDVBVideo::~eDVBVideo()
 {
+       if (m_sn)
+               delete m_sn;
        if (m_is_slow_motion)
                setSlowMotion(0);
        if (m_is_fast_forward)
@@ -289,6 +298,37 @@ eDVBVideo::~eDVBVideo()
                ::close(m_fd_demux);
 }
 
+void eDVBVideo::video_event(int)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       struct video_event evt;
+       if (::ioctl(m_fd, VIDEO_GET_EVENT, &evt) < 0)
+               eDebug("VIDEO_GET_EVENT failed(%m)");
+       else
+       {
+               if (evt.type == VIDEO_EVENT_SIZE_CHANGED)
+               {
+                       struct iTSMPEGDecoder::videoEvent event;
+                       event.type = iTSMPEGDecoder::videoEvent::eventSizeChanged;
+                       event.aspect = evt.u.size.aspect_ratio;
+                       event.height = evt.u.size.h;
+                       event.width = evt.u.size.w;
+                       /* emit */ m_event(event);
+               }
+               else
+                       eDebug("unhandled DVBAPI Video Event %d", evt.type);
+       }
+#else
+#warning "FIXMEE!! Video Events not implemented for old api"
+#endif
+}
+
+RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_event.connect(event));
+       return 0;
+}
+
 DEFINE_REF(eDVBPCR);
 
 eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
@@ -440,6 +480,7 @@ int eTSMPEGDecoder::setState()
        if (m_changed & changeVideo)
        {
                m_video = new eDVBVideo(m_demux, m_decoder);
+               m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
                if (m_video->startPid(m_vpid))
                {
                        eWarning("video: startpid failed!");
@@ -487,6 +528,7 @@ int eTSMPEGDecoder::setState()
                {
                        eDebug("new video");
                        m_video = new eDVBVideo(m_demux, m_decoder);
+                       m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
                        if (m_video->startPid(m_vpid, m_vtype))
                        {
                                eWarning("video: startpid failed!");
@@ -547,8 +589,10 @@ RESULT eTSMPEGDecoder::setPCMDelay(int delay)
                        fprintf(fp, "%x", delay*90);
                        fclose(fp);
                        m_pcm_delay = delay;
+                       return 0;
                }
        }
+       return -1;
 }
 
 RESULT eTSMPEGDecoder::setAC3Delay(int delay)
@@ -561,13 +605,15 @@ RESULT eTSMPEGDecoder::setAC3Delay(int delay)
                        fprintf(fp, "%x", delay*90);
                        fclose(fp);
                        m_ac3_delay = delay;
+                       return 0;
                }
        }
+       return -1;
 }
 
 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);
+       demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
        m_is_ff = m_is_sm = m_is_trickmode = 0;
 }
 
@@ -770,6 +816,7 @@ RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
 RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename)
 {
        m_radio_pic = filename;
+       return 0;
 }
 
 RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
@@ -820,7 +867,7 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
                                        ++cnt;
                                }
                                write(vfd, buffer, pos);
-                               usleep(50000);
+                               usleep(75000);  // i dont like this.. but i dont have a better solution :(
                                if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX) < 0)
                                        eDebug("VIDEO_SELECT_SOURCE DEMUX failed (%m)");
                                if (ioctl(vfd, VIDEO_FAST_FORWARD, 0) < 0)
@@ -843,3 +890,15 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
        }
        return 0;
 }
+
+RESULT eTSMPEGDecoder::connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_video_event.connect(event));
+       return 0;
+}
+
+void eTSMPEGDecoder::video_event(struct videoEvent event)
+{
+       /* emit */ m_video_event(event);
+}
+