From f604d2c7c5b6d8c004017007028415fe3560208a Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Sun, 15 Jan 2006 23:46:30 +0000 Subject: [PATCH] remove VolumeControl from infobar --- lib/python/Screens/InfoBar.py | 10 ++-- lib/python/Screens/InfoBarGenerics.py | 61 ----------------------- mytest.py | 70 +++++++++++++++++++++++++-- 3 files changed, 72 insertions(+), 69 deletions(-) diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index f084c767..2b96f1e5 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -11,7 +11,7 @@ from Components.ServicePosition import ServicePosition from Tools.Notifications import AddNotificationWithCallback -from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \ +from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ @@ -23,7 +23,7 @@ from enigma import * import time -class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, +class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, @@ -39,7 +39,7 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, }) for x in HelpableScreen, \ - InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ + InfoBarShowHide, InfoBarPowerKey, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \ InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ @@ -61,7 +61,7 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, if service is not None: self.session.open(MoviePlayer, service) -class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ +class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \ InfoBarMenu, \ InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications): @@ -73,7 +73,7 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) - for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications: + for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications: x.__init__(self) self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index a627cdb4..4640de05 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -16,8 +16,6 @@ from ServiceReference import ServiceReference from EpgSelection import EPGSelection from Screens.MessageBox import MessageBox -from Screens.Volume import Volume -from Screens.Mute import Mute from Screens.Dish import Dish from Screens.Standby import Standby from Screens.EventView import EventView @@ -38,65 +36,6 @@ from Components.config import config, currentConfigSelectionElement # hack alert! from Menu import MainMenu, mdom -from GlobalActions import globalActionMap - -class InfoBarVolumeControl: - """Volume control, handles volUp, volDown, volMute actions and display - a corresponding dialog""" - - def __init__(self): - global globalActionMap - globalActionMap.actions["volumeUp"]=self.volUp - globalActionMap.actions["volumeDown"]=self.volDown - globalActionMap.actions["volumeMute"]=self.volMute - - config.audio = ConfigSubsection() - config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100))) - - self.volumeDialog = self.session.instantiateDialog(Volume) - self.muteDialog = self.session.instantiateDialog(Mute) - - self.hideVolTimer = eTimer() - self.hideVolTimer.timeout.get().append(self.volHide) - - vol = config.audio.volume.value[0] - self.volumeDialog.setValue(vol) - eDVBVolumecontrol.getInstance().setVolume(vol, vol) - - def volSave(self): - config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume() - config.audio.volume.save() - - def volUp(self): - if (eDVBVolumecontrol.getInstance().isMuted()): - self.volMute() - eDVBVolumecontrol.getInstance().volumeUp() - self.volumeDialog.instance.show() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.volSave() - self.hideVolTimer.start(3000, True) - - def volDown(self): - if (eDVBVolumecontrol.getInstance().isMuted()): - self.volMute() - eDVBVolumecontrol.getInstance().volumeDown() - self.volumeDialog.instance.show() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.volSave() - self.hideVolTimer.start(3000, True) - - def volHide(self): - self.volumeDialog.instance.hide() - - def volMute(self): - eDVBVolumecontrol.getInstance().volumeToggleMute() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - - if (eDVBVolumecontrol.getInstance().isMuted()): - self.muteDialog.instance.show() - else: - self.muteDialog.instance.hide() - class InfoBarDish: def __init__(self): self.dishDialog = self.session.instantiateDialog(Dish) diff --git a/mytest.py b/mytest.py index 13eb4a7e..1823d8c2 100644 --- a/mytest.py +++ b/mytest.py @@ -199,6 +199,68 @@ class Session: self.currentDialog.returnValue = retval self.delayTimer.start(0, 1) +from Screens.Volume import Volume +from Screens.Mute import Mute +from GlobalActions import globalActionMap +from Components.config import ConfigSubsection, configSequence, configElement, configsequencearg + +#TODO .. move this to a own .py file +class VolumeControl: + """Volume control, handles volUp, volDown, volMute actions and display + a corresponding dialog""" + def __init__(self, session): + global globalActionMap + globalActionMap.actions["volumeUp"]=self.volUp + globalActionMap.actions["volumeDown"]=self.volDown + globalActionMap.actions["volumeMute"]=self.volMute + + config.audio = ConfigSubsection() + config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100))) + + self.volumeDialog = session.instantiateDialog(Volume) + self.muteDialog = session.instantiateDialog(Mute) + + self.hideVolTimer = eTimer() + self.hideVolTimer.timeout.get().append(self.volHide) + + vol = config.audio.volume.value[0] + self.volumeDialog.setValue(vol) + eDVBVolumecontrol.getInstance().setVolume(vol, vol) + + def volSave(self): + config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume() + config.audio.volume.save() + + def volUp(self): + if (eDVBVolumecontrol.getInstance().isMuted()): + self.volMute() + eDVBVolumecontrol.getInstance().volumeUp() + self.volumeDialog.instance.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volSave() + self.hideVolTimer.start(3000, True) + + def volDown(self): + if (eDVBVolumecontrol.getInstance().isMuted()): + self.volMute() + eDVBVolumecontrol.getInstance().volumeDown() + self.volumeDialog.instance.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volSave() + self.hideVolTimer.start(3000, True) + + def volHide(self): + self.volumeDialog.instance.hide() + + def volMute(self): + eDVBVolumecontrol.getInstance().volumeToggleMute() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + + if (eDVBVolumecontrol.getInstance().isMuted()): + self.muteDialog.instance.show() + else: + self.muteDialog.instance.hide() + def runScreenTest(): session = Session() session.desktop = getDesktop() @@ -207,11 +269,11 @@ def runScreenTest(): screensToRun = wizardManager.getWizards() screensToRun.append(Screens.InfoBar.InfoBar) - + def runNextScreen(session, screensToRun, *result): if result: quitMainloop(result) - + screen = screensToRun[0] if len(screensToRun): @@ -220,9 +282,11 @@ def runScreenTest(): session.open(screen) runNextScreen(session, screensToRun) - + CONNECT(keyPressedSignal(), session.keyEvent) + vol = VolumeControl(session) + runReactor() configfile.save() -- 2.30.2