add audioselection, removed democode

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index e5203fa094a56bd253401e225246d5d14bc29469..7e059c5ccae17d812fe5d29bb134fd5823d44807 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -16,6 +16,7 @@ from Screens.MovieSelection import MovieSelection
 from Screens.Volume import Volume
 from Screens.Mute import Mute
 from Screens.Standby import Standby
+from Screens.AudioSelection import AudioSelection
 
 from ServiceReference import ServiceReference
 
@@ -132,6 +133,8 @@ class InfoBar(Screen):
                                
                                "seekFwd": self.seekFwd,
                                "seekBack": self.seekBack,
+                               
+                               "audioSelection": self.audioSelection,
                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                
@@ -165,11 +168,15 @@ class InfoBar(Screen):
                self.quit()
        
        def powerdown(self):
+               self.standbyblocked = 0
                self.powerKeyTimer.start(3000)
 
        def powerup(self):
                self.powerKeyTimer.stop()
-               self.session.open(Standby, self)
+               if self.standbyblocked == 0:
+                       self.standbyblocked = 1
+                       self.session.open(Standby, self)
+                       
 
        def keyNumberGlobal(self, number):
                print "You pressed number " + str(number)
@@ -255,7 +262,7 @@ class InfoBar(Screen):
        def quit(self):
                #       self.session.open(Standby, self)
                configfile.save()
-               quitMainloop()
+               quitMainloop(0)
        
        def stopCurrentRecording(self): 
                print "remove entry"
@@ -317,3 +324,10 @@ class InfoBar(Screen):
        
        def seekBack(self):
                self.doSeek(-1, 10000)
+
+       def audioSelection(self):
+               service = self.session.nav.getCurrentService()
+               audio = service.audioTracks()
+               n = audio.getNumberOfTracks()
+               if n > 0:
+                       self.session.open(AudioSelection, audio)