From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 15 Jun 2007 19:26:52 +0000 (+0000)
Subject: fix yesterday "infobar was not shown when a service was selected in
X-Git-Tag: 2.6.0~2174
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/2dc726e42db65a782cc09e56a519c086f6854f5b

fix yesterday "infobar was not shown when a service was selected in
servicelist" fix
---

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index ab40838d..37c38691 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -8,6 +8,7 @@ from Screens.Ci import CiHandler
 from Components.Sources.Clock import Clock
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker
 
 from Tools.Notifications import AddNotificationWithCallback
 
@@ -22,6 +23,8 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
+from enigma import iPlayableService
+
 class InfoBar(InfoBarShowHide,
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
 	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
@@ -60,6 +63,40 @@ class InfoBar(InfoBarShowHide,
 
 		self["CurrentTime"] = Clock()
 
+		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+			{
+				iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
+			})
+
+		self.current_begin_time=0
+
+	def __eventInfoChanged(self):
+		if self.execing:
+			service = self.session.nav.getCurrentService()
+			old_begin_time = self.current_begin_time
+			info = service and service.info()
+			ptr = info and info.getEvent(0)
+			self.current_begin_time = ptr and ptr.getBeginTime() or 0
+			if config.usage.show_infobar_on_event_change.value:
+				if old_begin_time and old_begin_time != self.current_begin_time:
+					self.doShow()
+
+	def __checkServiceStarted(self):
+		self.__serviceStarted(True)
+		self.onExecBegin.remove(self.__checkServiceStarted)
+
+	def serviceStarted(self):  #override from InfoBarShowHide
+		new = self.servicelist.newServicePlayed()
+		if self.execing:
+			InfoBarShowHide.serviceStarted(self)
+			self.current_begin_time=0
+		elif not self.__checkServiceStarted in self.onShown and new:
+			self.onShown.append(self.__checkServiceStarted)
+
+	def __checkServiceStarted(self):
+		self.serviceStarted()
+		self.onShown.remove(self.__checkServiceStarted)
+
 	def showTv(self):
 		self.showTvChannelList(True)
 
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index da0e6d6f..efe2c78d 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -70,8 +70,7 @@ class InfoBarShowHide:
 
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
-				iPlayableService.evStart: self.__serviceStarted,
-				iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
+				iPlayableService.evStart: self.serviceStarted,
 			})
 
 		self.__state = self.STATE_SHOWN
@@ -83,31 +82,11 @@ class InfoBarShowHide:
 		
 		self.onShow.append(self.__onShow)
 		self.onHide.append(self.__onHide)
-		self.current_begin_time=0
 
-	def __eventInfoChanged(self):
+	def serviceStarted(self):
 		if self.execing:
-			service = self.session.nav.getCurrentService()
-			old_begin_time = self.current_begin_time
-			info = service and service.info()
-			ptr = info and info.getEvent(0)
-			self.current_begin_time = ptr and ptr.getBeginTime() or 0
-			if config.usage.show_infobar_on_event_change.value:
-				if old_begin_time and old_begin_time != self.current_begin_time:
-					self.doShow()
-
-	def __serviceStarted(self, force=False):
-		new = self.servicelist.newServicePlayed()
-		if self.execing or force:
-			self.current_begin_time=0
 			if config.usage.show_infobar_on_zap.value:
 				self.doShow()
-		elif not self.__checkServiceStarted in self.onExecBegin and new:
-			self.onExecBegin.append(self.__checkServiceStarted)
-
-	def __checkServiceStarted(self):
-		self.__serviceStarted(True)
-		self.onExecBegin.remove(self.__checkServiceStarted)
 
 	def __onShow(self):
 		self.__state = self.STATE_SHOWN