rewrite ServiceEventTracker and PerServiceBase service event handle code

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 7ad1a25d16d0cd2f0c80eee1a7bf7e08c88ab463..440317266cc7fd038afab63ee12ef90c49890dea 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1007,7 +1007,12 @@ RESULT eTSMPEGDecoder::setSyncMaster(int who)
 
 RESULT eTSMPEGDecoder::start()
 {
+       timespec now, tmp;
+       extern timespec service_start;
        RESULT r;
+       clock_gettime(CLOCK_MONOTONIC, &now);
+       tmp = now - service_start;
+       eDebug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! %d:%d", tmp.tv_sec, tmp.tv_nsec);
        r = setState();
        if (r)
                return r;

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index d3c51ab2a41def473b180a918f5d49b9b22c4219..df8cf9feb1ea600df657ea845629472e19ae9de1 100644 (file)
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -18,4 +18,4 @@ install_PYTHON = \
        MultiContent.py MediaPlayer.py TunerInfo.py VideoWindow.py ChoiceList.py \
        Element.py Playlist.py ParentalControl.py ParentalControlList.py \
        Ipkg.py SelectionList.py Scanner.py SystemInfo.py DreamInfoHandler.py \
-       Task.py
+       Task.py Thread.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 64ae5492e5604d70e13d61c6ca81edd1ac7490d5..57870212048ac524a46c1710205ef93e25566f61 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -1086,7 +1086,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
                                "keyTV": self.setModeTv,
                        })
 
-               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+               self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
                        {
                                iPlayableService.evStart: self.__evServiceStart,
                                iPlayableService.evEnd: self.__evServiceEnd
@@ -1356,7 +1356,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                                "ok": self.channelSelected,
                        })
 
-               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+               self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
                        {
                                iPlayableService.evStart: self.__evServiceStart,
                                iPlayableService.evEnd: self.__evServiceEnd

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2227f8b99e4ea414a328b0ddf96eed889220d96c..9d2578585dd9ab218c2970b0a37fa3eb43d319ce 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -62,7 +62,7 @@ class InfoBarShowHide:
                                "hide": self.hide,
                        }, 1) # lower prio to make it possible to override ok and cancel..
 
-               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+               self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
                        {
                                iPlayableService.evStart: self.serviceStarted,
                        })

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 307c317fecbcd55330f5b03f3ce34d1e4a94a320..f13ae50ea8a023cc4955568a1c46ad0375ba9910 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -939,6 +939,8 @@ RESULT eDVBServiceList::setListName(const std::string &name)
        return m_bouquet->setListName(name);
 }
 
+timespec service_start;
+
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
 {
        ePtr<eDVBService> service;
@@ -946,6 +948,7 @@ RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableServ
        if (r)
                service = 0;
                // check resources...
+       clock_gettime(CLOCK_MONOTONIC, &service_start);
        ptr = new eDVBServicePlay(ref, service);
        return 0;
 }