infobar: delete seek timer on close in pvr mode

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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9d610dc8ba66e3f48cfbc9e01a5ff88250c3ebbb..d564d09215c18c63aaf15876081f5f6fe92cc9bc 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -39,7 +39,7 @@ class InfoBarVolumeControl:
        a corresponding dialog"""
        def __init__(self):
                config.audio = ConfigSubsection()
        a corresponding dialog"""
        def __init__(self):
                config.audio = ConfigSubsection()

-               config.audio.volume = configElement("config.audio.volume", configSequence, [5], configsequencearg.get("INTEGER", (0, 100)))
+               config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))

 
                self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] ,
                        {
 
                self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] ,
                        {


@@ -69,7 +69,7 @@ class InfoBarVolumeControl:
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()

-               self.hideVolTimer.start(3000)
+               self.hideVolTimer.start(3000, True)

 
        def     volDown(self):
                if (eDVBVolumecontrol.getInstance().isMuted()):
 
        def     volDown(self):
                if (eDVBVolumecontrol.getInstance().isMuted()):


@@ -78,7 +78,7 @@ class InfoBarVolumeControl:
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()

-               self.hideVolTimer.start(3000)
+               self.hideVolTimer.start(3000, True)

                
        def volHide(self):
                self.volumeDialog.instance.hide()
                
        def volHide(self):
                self.volumeDialog.instance.hide()


@@ -119,7 +119,7 @@ class InfoBarShowHide:
                
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
                
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)

-               self.hideTimer.start(5000)
+               self.hideTimer.start(5000, True)

 
        def delHideTimer(self):
                del self.hideTimer
 
        def delHideTimer(self):
                del self.hideTimer


@@ -129,8 +129,7 @@ class InfoBarShowHide:
                
        def show(self):
                self.state = self.STATE_SHOWN
                
        def show(self):
                self.state = self.STATE_SHOWN

-               self.hideTimer.stop()
-               self.hideTimer.start(5000)
+               self.hideTimer.start(5000, True)

 
        def doTimerHide(self):
                self.hideTimer.stop()
 
        def doTimerHide(self):
                self.hideTimer.stop()


@@ -167,7 +166,7 @@ class NumberZap(Screen):
                self.close(int(self["number"].getText()))
 
        def keyNumberGlobal(self, number):
                self.close(int(self["number"].getText()))
 
        def keyNumberGlobal(self, number):

-               self.Timer.start(3000)          #reset timer
+               self.Timer.start(3000, True)            #reset timer

                self.field = self.field + str(number)
                self["number"].setText(self.field)
                if len(self.field) >= 4:
                self.field = self.field + str(number)
                self["number"].setText(self.field)
                if len(self.field) >= 4:


@@ -199,7 +198,7 @@ class NumberZap(Screen):
 
                self.Timer = eTimer()
                self.Timer.timeout.get().append(self.keyOK)
 
                self.Timer = eTimer()
                self.Timer.timeout.get().append(self.keyOK)

-               self.Timer.start(3000)
+               self.Timer.start(3000, True)

 
 class InfoBarPowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
 
 class InfoBarPowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""


@@ -221,7 +220,7 @@ class InfoBarPowerKey:
        
        def powerdown(self):
                self.standbyblocked = 0
        
        def powerdown(self):
                self.standbyblocked = 0

-               self.powerKeyTimer.start(3000)
+               self.powerKeyTimer.start(3000, True)

 
        def powerup(self):
                self.powerKeyTimer.stop()
 
        def powerup(self):
                self.powerKeyTimer.stop()


@@ -400,7 +399,7 @@ class InfoBarTuner:
                self["ber_progress"] = ProgressBar()
                self.timer = eTimer()
                self.timer.timeout.get().append(self.updateTunerInfo)
                self["ber_progress"] = ProgressBar()
                self.timer = eTimer()
                self.timer.timeout.get().append(self.updateTunerInfo)

-               self.timer.start(500)
+               self.timer.start(1000)

 
        def calc(self,val):
                if not val:
 
        def calc(self,val):
                if not val:


@@ -478,6 +477,10 @@ class InfoBarPVR:
                self.seekTimer = eTimer()
                self.seekTimer.timeout.get().append(self.seekTimerFired)
                self.skipinterval = 500 # 500ms skip interval
                self.seekTimer = eTimer()
                self.seekTimer.timeout.get().append(self.seekTimerFired)
                self.skipinterval = 500 # 500ms skip interval

+               self.onClose.append(self.delSeekTimer)
+       
+       def delSeekTimer(self):
+               del self.seekTimer

        
        def seekTimerFired(self):
                if self.skipmode > 0:
        
        def seekTimerFired(self):
                if self.skipmode > 0: