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 57870212048ac524a46c1710205ef93e25566f61..64ae5492e5604d70e13d61c6ca81edd1ac7490d5 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, 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 9d2578585dd9ab218c2970b0a37fa3eb43d319ce..2227f8b99e4ea414a328b0ddf96eed889220d96c 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, in_thread=True, eventmap=
+               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evStart: self.serviceStarted,
                        })