X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/142e649e1eb5f6e74f81a69bc7c7e093fb8716c9..f604d2c7c5b6d8c004017007028415fe3560208a:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index b28ce515..2b96f1e5 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,7 +1,9 @@
 from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
+from Screens.ChannelSelection import ChannelSelectionRadio
 from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
 
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
@@ -9,11 +11,11 @@ from Components.ServicePosition import ServicePosition
 
 from Tools.Notifications import AddNotificationWithCallback
 
-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
+from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
+	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
 	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
-	InfoBarSubserviceSelection, InfoBarTuner
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -21,7 +23,7 @@ from enigma import *
 
 import time
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
 	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
 	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
@@ -32,20 +34,26 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
 
 		self["actions"] = HelpableActionMap(self, "InfobarActions",
 			{
-				"showMovies": (self.showMovies, _("Play recorded movies..."))
+				"showMovies": (self.showMovies, _("Play recorded movies...")),
+				"showRadio": (self.showRadio, _("Show the radio player..."))
 			})
 		
 		for x in HelpableScreen, \
-				InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+				InfoBarShowHide, InfoBarPowerKey, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
 				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
-				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner:
+				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+				InfoBarTuner:
 			x.__init__(self)
 
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
+		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
 
 		self["CurrentTime"] = Clock()
 
+	def showRadio(self):
+		self.session.open(ChannelSelectionRadio)
+
 	def showMovies(self):
 		self.session.openWithCallback(self.movieSelected, MovieSelection)
 
@@ -53,9 +61,9 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
 		if service is not None:
 			self.session.open(MoviePlayer, service)
 
-class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \
 		InfoBarMenu, \
-		InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
+		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
 		
 	def __init__(self, session, service):
 		Screen.__init__(self, session)
@@ -65,7 +73,7 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
 			})
 		
-		for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
+		for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications:
 			x.__init__(self)
 
 		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
@@ -80,3 +88,11 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 		if answer == True:
 			self.session.nav.playService(self.lastservice)
 			self.close()
+			
+	def showMovies(self):
+		ref = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+
+	def movieSelected(self, service):
+		if service is not None:
+			self.session.nav.playService(service)