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 ef44ef3e5c5d3aaa499f9e310a825fccefd13620..7e059c5ccae17d812fe5d29bb134fd5823d44807 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,16 +1,24 @@
 from Screen import Screen
 from Screen import Screen

+from EpgSelection import EPGSelection

 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap

+from Components.ActionMap import NumberActionMap

 from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 from Components.ServicePosition import ServicePosition
 from Components.config import configfile
 from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 from Components.ServicePosition import ServicePosition
 from Components.config import configfile

+from Components.Label import Label

 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
 from Screens.Volume import Volume
 
 from Screens.MessageBox import MessageBox
 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

 
 from enigma import *
 
 
 from enigma import *
 


@@ -19,6 +27,50 @@ import time
 # hack alert!
 from Menu import MainMenu, mdom
 
 # hack alert!
 from Menu import MainMenu, mdom
 

+class NumberZap(Screen):
+       def quit(self):
+               self.Timer.stop()
+               self.close()
+
+       def keyOK(self):
+               self.Timer.stop()
+               print "do the action here"
+               self.close()
+
+       def keyNumberGlobal(self, number):
+               self.Timer.start(3000)          #reset timer
+               self.field = self.field + str(number)
+               self["number"].setText(self.field)
+               if len(self.field) >= 4:
+                       self.keyOK()
+
+       def __init__(self, session, number):
+               Screen.__init__(self, session)
+               self.field = str(number)
+               
+               self["number"] = Label(self.field)
+
+               self["actions"] = NumberActionMap( [ "SetupActions" ], 
+                       {
+                               "cancel": self.quit,
+                               "ok": self.keyOK,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal
+                       })
+
+               self.Timer = eTimer()
+               self.Timer.timeout.get().append(self.keyOK)
+               self.Timer.start(3000)
+
+

 class InfoBar(Screen):
        STATE_HIDDEN = 0
        STATE_HIDING = 1
 class InfoBar(Screen):
        STATE_HIDDEN = 0
        STATE_HIDING = 1


@@ -34,13 +86,20 @@ class InfoBar(Screen):
                self.state = self.STATE_HIDDEN
                
                self.volumeDialog = self.session.instantiateDialog(Volume)
                self.state = self.STATE_HIDDEN
                
                self.volumeDialog = self.session.instantiateDialog(Volume)

+               self.muteDialog = self.session.instantiateDialog(Mute)

                
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
                #self.hideTimer.start(1000)
                
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
                #self.hideTimer.start(1000)

+               
+               self.hideVolTimer = eTimer()
+               self.hideVolTimer.timeout.get().append(self.volHide)
+               
+               self.powerKeyTimer = eTimer()
+               self.powerKeyTimer.timeout.get().append(self.powertimer)

 
 

-
-               self["actions"] = ActionMap( [ "InfobarActions" ], 
+               #self["actions"] = ActionMap( [ "InfobarActions" ], 
+               self["actions"] = NumberActionMap( [ "InfobarActions" ], 

                        {
                                "switchChannelUp": self.switchChannelUp,
                                "switchChannelDown": self.switchChannelDown,
                        {
                                "switchChannelUp": self.switchChannelUp,
                                "switchChannelDown": self.switchChannelDown,


@@ -54,7 +113,28 @@ class InfoBar(Screen):
                                "hide": self.hide,
                                "toggleShow": self.toggleShow,
                                "showMovies": self.showMovies,
                                "hide": self.hide,
                                "toggleShow": self.toggleShow,
                                "showMovies": self.showMovies,

-                               "quit": self.quit
+                               #"quit": self.quit,
+                               "powerdown": self.powerdown,
+                               "powerup": self.powerup,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal,
+                               "showEPGList": self.showEPGList,
+                               
+                               "pauseService": self.pauseService,
+                               "unPauseService": self.unPauseService,
+                               
+                               "seekFwd": self.seekFwd,
+                               "seekBack": self.seekBack,
+                               
+                               "audioSelection": self.audioSelection,

                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                
                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                


@@ -64,6 +144,9 @@ class InfoBar(Screen):
 
                self["ServiceName"] = ServiceName(self.session.nav)
                
 
                self["ServiceName"] = ServiceName(self.session.nav)
                

+               self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
+               self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime)
+                               

                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
                self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
 
                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
                self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
 


@@ -80,6 +163,25 @@ class InfoBar(Screen):
                assert menu.tagName == "menu", "root element in menu must be 'menu'!"
                self.session.open(MainMenu, menu, menu.childNodes)
 
                assert menu.tagName == "menu", "root element in menu must be 'menu'!"
                self.session.open(MainMenu, menu, menu.childNodes)
 

+       def powertimer(self):   
+               print "PowerOff - Now!"
+               self.quit()
+       
+       def powerdown(self):
+               self.standbyblocked = 0
+               self.powerKeyTimer.start(3000)
+
+       def powerup(self):
+               self.powerKeyTimer.stop()
+               if self.standbyblocked == 0:
+                       self.standbyblocked = 1
+                       self.session.open(Standby, self)
+                       
+
+       def keyNumberGlobal(self, number):
+               print "You pressed number " + str(number)
+               self.session.open(NumberZap, number)
+

        def switchChannelUp(self):      
                self.servicelist.moveUp()
                self.session.execDialog(self.servicelist)
        def switchChannelUp(self):      
                self.servicelist.moveUp()
                self.session.execDialog(self.servicelist)


@@ -121,16 +223,12 @@ class InfoBar(Screen):
                eDVBVolumecontrol.getInstance().volumeUp()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                eDVBVolumecontrol.getInstance().volumeUp()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())

-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)

                self.hideVolTimer.start(3000)
 
        def     volDown(self):
                eDVBVolumecontrol.getInstance().volumeDown()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.hideVolTimer.start(3000)
 
        def     volDown(self):
                eDVBVolumecontrol.getInstance().volumeDown()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())

-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)

                self.hideVolTimer.start(3000)
                
        def volHide(self):
                self.hideVolTimer.start(3000)
                
        def volHide(self):


@@ -146,11 +244,25 @@ class InfoBar(Screen):
 
        def     volMute(self):
                eDVBVolumecontrol.getInstance().volumeToggleMute()
 
        def     volMute(self):
                eDVBVolumecontrol.getInstance().volumeToggleMute()

-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               
+               if (eDVBVolumecontrol.getInstance().isMuted()):
+                       self.muteDialog.instance.show()
+               else:
+                       self.muteDialog.instance.hide()
+
+       def showEPGList(self):
+               ref=self.session.nav.getCurrentlyPlayingServiceReference()
+               ptr=eEPGCache.getInstance()
+               if ptr.startTimeQuery(ref) != -1:
+                       self.session.open(EPGSelection, ref)
+               else:
+                       print 'no epg for service', ref.toString()

 
 

-       def     quit(self):
+       def quit(self):
+               #       self.session.open(Standby, self)

                configfile.save()
                configfile.save()

-               quitMainloop()
+               quitMainloop(0)

        
        def stopCurrentRecording(self): 
                print "remove entry"
        
        def stopCurrentRecording(self): 
                print "remove entry"


@@ -171,7 +283,7 @@ class InfoBar(Screen):
                        pass
                
                # fix me, description. 
                        pass
                
                # fix me, description. 

-               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")

 
        def recordQuestionCallback(self, answer):
                if answer == False:
 
        def recordQuestionCallback(self, answer):
                if answer == False:


@@ -190,3 +302,32 @@ class InfoBar(Screen):
 
        def showMovies(self):
                self.session.open(MovieSelection)
 
        def showMovies(self):
                self.session.open(MovieSelection)

+
+       def pauseService(self):
+               self.session.nav.pause(1)
+               
+       def unPauseService(self):
+               self.session.nav.pause(0)
+       
+       def doSeek(self, dir, seektime):
+               service = self.session.nav.getCurrentService()
+               if service is None:
+                       return
+               
+               seekable = service.seek()
+               if seekable is None:
+                       return
+               seekable.seekRelative(dir, 90 * seektime)
+
+       def seekFwd(self):
+               self.doSeek(+1, 10000)
+       
+       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)