add pause support

diff --git a/data/keymap.xml b/data/keymap.xml
index b8f234c0142bfc7d2301662a91d8c323264c2b16..fa252fcc774473b6bf59e1ab6fe5a2c8da810b2a 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -83,6 +83,9 @@
                <key id="KEY_8" mapto="8" flags="m" />
                <key id="KEY_9" mapto="9" flags="m" />
                <key id="KEY_0" mapto="0" flags="m" />
                <key id="KEY_8" mapto="8" flags="m" />
                <key id="KEY_9" mapto="9" flags="m" />
                <key id="KEY_0" mapto="0" flags="m" />

+               
+               <key id="KEY_YELLOW" mapto="pauseService" flags="m" />
+               <key id="KEY_GREEN" mapto="unPauseService" flags="m" />

        </map>
        
        <map context="ChannelSelectActions">
        </map>
        
        <map context="ChannelSelectActions">

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index b7118558a3ae7e712f61df7908afbf2f2cefc9da..751796aeaea20f9f49e797740c7ec4c3bba6a662 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -183,6 +183,18 @@ void eDVBVideo::flush()
                eDebug("video: VIDEO_CLEAR_BUFFER: %m");
 }
        
                eDebug("video: VIDEO_CLEAR_BUFFER: %m");
 }
        

+void eDVBVideo::freeze()
+{
+       if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+               eDebug("video: VIDEO_FREEZE: %m");
+}
+       
+void eDVBVideo::unfreeze()
+{
+       if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+               eDebug("video: VIDEO_CONTINUE: %m");
+}
+       

 eDVBVideo::~eDVBVideo()
 {
        if (m_fd >= 0)
 eDVBVideo::~eDVBVideo()
 {
        if (m_fd >= 0)


@@ -407,12 +419,20 @@ RESULT eTSMPEGDecoder::start()
 
 RESULT eTSMPEGDecoder::freeze(int cont)
 {
 
 RESULT eTSMPEGDecoder::freeze(int cont)
 {

-       return -1;
+       if (m_video)
+               m_video->freeze();
+       else
+               return -1;
+       return 0;

 }
 
 RESULT eTSMPEGDecoder::unfreeze()
 {
 }
 
 RESULT eTSMPEGDecoder::unfreeze()
 {

-       return -1;
+       if (m_video)
+               m_video->unfreeze();
+       else
+               return -1;
+       return 0;

 }
 
 RESULT eTSMPEGDecoder::setSinglePictureMode(int when)
 }
 
 RESULT eTSMPEGDecoder::setSinglePictureMode(int when)

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index a26d6cf5d5defa350693034c3abea54737ee8e6b..68262fe0e869e8fdb35f65903181f8866f456fa8 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -37,6 +37,8 @@ public:
        void stopPid();
 #endif
        void flush();
        void stopPid();
 #endif
        void flush();

+       void freeze();
+       void unfreeze();

        virtual ~eDVBVideo();
 };
 
        virtual ~eDVBVideo();
 };
 

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 065097f8839a001a512ec003b78159549c6d7f4d..bf1d904bf50dab81a0fb41d9d2c6d55176632d7c 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -115,7 +115,10 @@ class InfoBar(Screen):
                                "8": self.keyNumberGlobal,
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumberGlobal,
                                "8": self.keyNumberGlobal,
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumberGlobal,

-                               "showEPGList": self.showEPGList
+                               "showEPGList": self.showEPGList,
+                               
+                               "pauseService": self.pauseService,
+                               "unPauseService": self.unPauseService,

                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                
                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                


@@ -240,7 +243,7 @@ class InfoBar(Screen):
                        pass
                
                # fix me, description. 
                        pass
                
                # fix me, description. 

-               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")

 
        def recordQuestionCallback(self, answer):
                if answer == False:
 
        def recordQuestionCallback(self, answer):
                if answer == False:


@@ -259,3 +262,9 @@ class InfoBar(Screen):
 
        def showMovies(self):
                self.session.open(MovieSelection)
 
        def showMovies(self):
                self.session.open(MovieSelection)

+
+       def pauseService(self):
+               self.session.nav.pause(1)
+               
+       def unPauseService(self):
+               self.session.nav.pause(0)

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index fdf93d7693aa01f2eab2b9fc14bc8828c63eb6eb..f3215d82f1059069a3e2a5d7f1cd07ff6e98d7fa 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -365,7 +365,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
 }
 
 eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 
 }
 
 eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 

-       m_reference(ref), m_dvb_service(service), m_service_handler(0)
+       m_reference(ref), m_dvb_service(service), m_service_handler(0), m_is_paused(0)

 {
        m_is_pvr = !ref.path.empty();
        
 {
        m_is_pvr = !ref.path.empty();
        


@@ -518,7 +518,12 @@ RESULT eDVBServicePlay::connectEvent(const Slot2<void,iPlayableService*,int> &ev
 
 RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
 {
 
 RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
 {

-               // not yet possible, maybe later...
+       if (m_is_pvr)
+       {
+               ptr = this;
+               return 0;
+       }
+

        ptr = 0;
        return -1;
 }
        ptr = 0;
        return -1;
 }


@@ -548,6 +553,26 @@ RESULT eDVBServicePlay::getLength(pts_t &len)
        return pvr_channel->getLength(len);
 }
 
        return pvr_channel->getLength(len);
 }
 

+RESULT eDVBServicePlay::pause()
+{
+       if (!m_is_paused && m_decoder)
+       {
+               m_is_paused = 1;
+               return m_decoder->freeze(0);
+       } else
+               return -1;
+}
+
+RESULT eDVBServicePlay::unpause()
+{
+       if (m_is_paused && m_decoder)
+       {
+               m_is_paused = 0;
+               return m_decoder->unfreeze();
+       } else
+               return -1;
+}
+

 RESULT eDVBServicePlay::seekTo(pts_t to)
 {
        return -1;
 RESULT eDVBServicePlay::seekTo(pts_t to)
 {
        return -1;

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 57dca9a0eb20c630fa943c29085af9ac3e2900bc..f47c3906012ee31262703fb2e5c73159d9694ea5 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -41,28 +41,9 @@ private:
        ePtr<iDVBChannelListQuery> m_query;
 };
 
        ePtr<iDVBChannelListQuery> m_query;
 };
 

-class eDVBServicePlay: public iPlayableService, iSeekableService, public Object, public iServiceInformation
+class eDVBServicePlay: public iPlayableService, public iPauseableService, public iSeekableService, public Object, public iServiceInformation

 {
 DECLARE_REF(eDVBServicePlay);
 {
 DECLARE_REF(eDVBServicePlay);

-private:
-       friend class eServiceFactoryDVB;
-       eServiceReference m_reference;
-       
-       ePtr<eDVBService> m_dvb_service;
-       
-       ePtr<iTSMPEGDecoder> m_decoder;
-       
-       eDVBServicePMTHandler m_service_handler;
-       eDVBServiceEITHandler m_event_handler;
-       
-       eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
-       
-       void gotNewEvent();
-       
-       void serviceEvent(int event);
-       Signal2<void,iPlayableService*,int> m_event;
-       
-       int m_is_pvr;

 public:
        virtual ~eDVBServicePlay();
 
 public:
        virtual ~eDVBServicePlay();
 


@@ -74,6 +55,10 @@ public:
        RESULT pause(ePtr<iPauseableService> &ptr);
        RESULT info(ePtr<iServiceInformation> &ptr);
        
        RESULT pause(ePtr<iPauseableService> &ptr);
        RESULT info(ePtr<iServiceInformation> &ptr);
        

+               // iPauseableService
+       RESULT pause();
+       RESULT unpause();
+       

                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);
                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);


@@ -82,6 +67,26 @@ public:
                // iServiceInformation
        RESULT getName(std::string &name);
        RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
                // iServiceInformation
        RESULT getName(std::string &name);
        RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);

+
+private:
+       friend class eServiceFactoryDVB;
+       eServiceReference m_reference;
+       
+       ePtr<eDVBService> m_dvb_service;
+       
+       ePtr<iTSMPEGDecoder> m_decoder;
+       
+       eDVBServicePMTHandler m_service_handler;
+       eDVBServiceEITHandler m_event_handler;
+       
+       eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
+       
+       void gotNewEvent();
+       
+       void serviceEvent(int event);
+       Signal2<void,iPlayableService*,int> m_event;
+       
+       int m_is_pvr, m_is_paused;

 };
 
 #endif
 };
 
 #endif