a few more debugging to debug the pvr state stuff

[enigma2.git] / lib / service / servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index e7d15ba7545a7aa73dcd91aeb683d2f9522f2655..a873576d2500ff34c5d9a253ffca63fbb4047ef0 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1065,7 +1065,9 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
        
        m_tune_state = -1;
 
-       CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
+       m_subtitle_sync_timer = eTimer::create(eApp);
+
+       CONNECT(m_subtitle_sync_timer->timeout, eDVBServicePlay::checkSubtitleTiming);
 }
 
 eDVBServicePlay::~eDVBServicePlay()
@@ -1284,6 +1286,7 @@ RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
 
 RESULT eDVBServicePlay::setSlowMotion(int ratio)
 {
+       eDebug("eDVBServicePlay::setSlowMotion(%d)", ratio);
        if (m_decoder)
                return m_decoder->setSlowMotion(ratio);
        else
@@ -1292,6 +1295,7 @@ RESULT eDVBServicePlay::setSlowMotion(int ratio)
 
 RESULT eDVBServicePlay::setFastForward(int ratio)
 {
+       eDebug("eDVBServicePlay::setFastForward(%d)", ratio);
        int skipmode, ffratio;
        
        if (ratio > 8)
@@ -1352,6 +1356,7 @@ RESULT eDVBServicePlay::getLength(pts_t &len)
 
 RESULT eDVBServicePlay::pause()
 {
+       eDebug("eDVBServicePlay::pause");
        if (!m_is_paused && m_decoder)
        {
                m_is_paused = 1;
@@ -1362,6 +1367,7 @@ RESULT eDVBServicePlay::pause()
 
 RESULT eDVBServicePlay::unpause()
 {
+       eDebug("eDVBServicePlay::unpause");
        if (m_is_paused && m_decoder)
        {
                m_is_paused = 0;
@@ -1601,22 +1607,22 @@ int eDVBServicePlay::getInfo(int w)
        {
 #if HAVE_DVB_API_VERSION >= 3
        case sVideoHeight:
-               if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+               if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged)
                        return m_videoEventData.height;
                else
                        return readMpegProc("yres", !m_is_primary);
        case sVideoWidth:
-               if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+               if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged)
                        return m_videoEventData.width;
                else
                        return readMpegProc("xres", !m_is_primary);
        case sFrameRate:
-               if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+               if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventFrameRateChanged)
                        return m_videoEventData.framerate;
                else
                        return readMpegProc("framerate", !m_is_primary);
        case sProgressive:
-               if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+               if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventProgressiveChanged)
                        return m_videoEventData.progressive;
                return readMpegProc("progressive", !m_is_primary);
 #else
@@ -1626,7 +1632,7 @@ int eDVBServicePlay::getInfo(int w)
        {
                int val;
 #if HAVE_DVB_API_VERSION >= 3
-               if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+               if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged)
                        return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3;
                else if ((val=readMpegProc("aspect", !m_is_primary)) != -1)
                        return val;
@@ -2926,7 +2932,7 @@ void eDVBServicePlay::checkSubtitleTiming()
                } else
                {
                        eDebug("start subtitle delay %d", diff / 90);
-                       m_subtitle_sync_timer.start(diff / 90, 1);
+                       m_subtitle_sync_timer->start(diff / 90, 1);
                        break;
                }
        }
@@ -2994,6 +3000,8 @@ void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
                case iTSMPEGDecoder::videoEvent::eventProgressiveChanged:
                        m_event((iPlayableService*)this, evVideoProgressiveChanged);
                        break;
+               default:
+                       break;
        }
 }