From: Andreas Monzner Date: Fri, 27 Jun 2008 20:24:08 +0000 (+0000) Subject: revert rest of local changes (so the complete commit is reverted now) X-Git-Tag: 2.6.0~1088 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/995273c1f71c79d72fa75da25da4a03bd83ac9a4?hp=27af195d31298de858014931bdbe06fee1d244e4 revert rest of local changes (so the complete commit is reverted now) --- diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 57870212..64ae5492 100644 --- 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, in_thread=True, eventmap= + self.__event_tracker = ServiceEventTracker(screen=self, 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, in_thread=True, eventmap= + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evStart: self.__evServiceStart, iPlayableService.evEnd: self.__evServiceEnd diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 9d257858..2227f8b9 100644 --- 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, in_thread=True, eventmap= + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evStart: self.serviceStarted, })