fix volume

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index ed193f389bb511ff4680dc10057e2efb78a31c35..ef44ef3e5c5d3aaa499f9e310a825fccefd13620 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,15 +1,16 @@
 from Screen import Screen
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
 from Screen import Screen
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock

-from Components.VolumeBar import VolumeBar

 from Components.ActionMap import ActionMap
 from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 from Components.ServicePosition import ServicePosition
 from Components.ActionMap import ActionMap
 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 Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection

+from Screens.Volume import Volume

 
 from enigma import *
 
 
 from enigma import *
 


@@ -29,9 +30,15 @@ class InfoBar(Screen):
 
                #instantiate forever
                self.servicelist = self.session.instantiateDialog(ChannelSelection)
 
                #instantiate forever
                self.servicelist = self.session.instantiateDialog(ChannelSelection)

-               self.volumeBar = VolumeBar()            

                
                self.state = self.STATE_HIDDEN
                
                self.state = self.STATE_HIDDEN

+               
+               self.volumeDialog = self.session.instantiateDialog(Volume)
+               
+               self.hideTimer = eTimer()
+               self.hideTimer.timeout.get().append(self.doTimerHide)
+               #self.hideTimer.start(1000)
+

 
                self["actions"] = ActionMap( [ "InfobarActions" ], 
                        {
 
                self["actions"] = ActionMap( [ "InfobarActions" ], 
                        {


@@ -51,11 +58,10 @@ class InfoBar(Screen):
                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                
                        })
 #              self["okbutton"] = Button("mainMenu", [self.mainMenu])
                

-               self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+               self["CurrentTime"] = Clock()
+               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)

                # Clock()
 
                # Clock()
 

-               self["Volume"] = self.volumeBar
-               

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


@@ -85,13 +91,23 @@ class InfoBar(Screen):
        def hide(self): 
                self.instance.hide()
 
        def hide(self): 
                self.instance.hide()
 

+       def doTimerHide(self):
+               if self.state == self.STATE_SHOWN:
+                       self.instance.hide()
+                       self.state = self.STATE_HIDDEN
+

        def toggleShow(self):
                if self.state == self.STATE_SHOWN:
        def toggleShow(self):
                if self.state == self.STATE_SHOWN:

-#                      self.instance.hide()
-                       self.startHide()
+                       self.instance.hide()
+                       #pls check animation support, sorry
+#                      self.startHide()
+                       self.state = self.STATE_HIDDEN

                else:
                else:

-#                      self.instance.show()
-                       self.startShow()
+                       self.instance.show()
+#                      self.startShow()
+                       self.state = self.STATE_SHOWN
+                       #TODO: make it customizable
+                       self.hideTimer.start(5000)

 
        def     zapUp(self):
                self.servicelist.moveUp()
 
        def     zapUp(self):
                self.servicelist.moveUp()


@@ -103,12 +119,23 @@ class InfoBar(Screen):
 
        def     volUp(self):
                eDVBVolumecontrol.getInstance().volumeUp()
 
        def     volUp(self):
                eDVBVolumecontrol.getInstance().volumeUp()

-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               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()
 
        def     volDown(self):
                eDVBVolumecontrol.getInstance().volumeDown()

-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               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.volumeDialog.instance.hide()
+

        def startShow(self):
                self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
                self.state = self.STATE_SHOWN
        def startShow(self):
                self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
                self.state = self.STATE_SHOWN


@@ -122,31 +149,44 @@ class InfoBar(Screen):
                self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
 
        def     quit(self):
                self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
 
        def     quit(self):

+               configfile.save()

                quitMainloop()
                quitMainloop()

+       
+       def stopCurrentRecording(self): 
+               print "remove entry"
+               self.session.nav.RecordTimer.removeEntry(self.recording)
+               self.recording = None
+       
+       def startInstantRecording(self):
+               serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
+                       
+               # try to get event info
+               epg = None
+               try:
+                       service = self.session.nav.getCurrentService()
+                       info = service.info()
+                       ev = info.getEvent(0)
+                       epg = ev
+               except:
+                       pass
+               
+               # fix me, description. 
+               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+
+       def recordQuestionCallback(self, answer):
+               if answer == False:
+                       return

                
                

+               if self.recording != None:
+                       self.stopCurrentRecording()
+               else:
+                       self.startInstantRecording()
+

        def instantRecord(self):
        def instantRecord(self):

-               #self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
-               #return
-       

                if self.recording != None:
                if self.recording != None:

-                       print "remove entry"
-                       self.session.nav.RecordTimer.removeEntry(self.recording)
-                       self.recording = None
+                       self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?")

                else:
                else:

-                       serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-                       
-                       # try to get event info
-                       epg = None
-                       service = self.session.nav.getCurrentService()
-                       if service != None:
-                               info = iServiceInformationPtr()
-                               if not service.info(info):
-                                       ev = eServiceEventPtr()
-                                       if info.getEvent(ev, 0) == 0:
-                                               epg = ev
-                       # fix me, description. 
-                       self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
-       
+                       self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+

        def showMovies(self):
                self.session.open(MovieSelection)
        def showMovies(self):
                self.session.open(MovieSelection)

-