add CMoviePlayer

[enigma2.git] / lib / python / Screens / InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index def45d69efd8a05735151447748e00c1b6b00b80..2dcef59f3c30489e5c02c72e82c321f466461a31 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,13 +1,16 @@
 from Screen import Screen
 
+from Screens.MovieSelection import MovieSelection
+from Screens.MessageBox import MessageBox
+
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap
-from Screens.AudioSelection import AudioSelection
-from Screens.MovieSelection import MovieSelection
+from Components.ServicePosition import ServicePosition
 
 from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
        InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord
+       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
+       InfoBarAudioSelection
 
 from enigma import *
 
@@ -15,32 +18,55 @@ import time
 
 class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-       InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord):
+       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection):
+
        def __init__(self, session):
                Screen.__init__(self, session)
+
+               self["actions"] = ActionMap( [ "InfobarActions" ],
+                       {
+                               "showMovies": self.showMovies,
+                       })
                
                for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
                        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-                       InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord:
+                       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection:
                        x.__init__(self)
 
-               self["actions"] = ActionMap( [ "InfobarActions" ], 
+               self["CurrentTime"] = Clock()
+
+       def showMovies(self):
+               self.session.openWithCallback(self.movieSelected, MovieSelection)
+       
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.open(MoviePlayer, service)
+
+class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+               InfoBarMenu, \
+               InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection):
+               
+       def __init__(self, session, service):
+               Screen.__init__(self, session)
+               
+               self["actions"] = ActionMap( [ "MoviePlayerActions" ],
                        {
-                               "showMovies": self.showMovies,
-                               #"quit": self.quit,
-                               "audioSelection": self.audioSelection,
+                               "leavePlayer": self.leavePlayer
                        })
+               
+               for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection:
+                       x.__init__(self)
 
                self["CurrentTime"] = Clock()
                # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               # Clock()
+               
+               self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.nav.playService(service)
 
-       def showMovies(self):
-               self.session.open(MovieSelection)
-
-       def audioSelection(self):
-               service = self.session.nav.getCurrentService()
-               audio = service.audioTracks()
-               n = audio.getNumberOfTracks()
-               if n > 0:
-                       self.session.open(AudioSelection, audio)
+       def leavePlayer(self):
+               self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, "Stop playing this movie?")
+       
+       def leavePlayerConfirmed(self, answer):
+               if answer == True:
+                       self.session.nav.playService(self.lastservice)
+                       self.close()