Merge remote branch 'remotes/origin/bug_620_dvdburn_absolutepaths'

[enigma2.git] / lib / python / Components / VolumeControl.py

diff --git a/lib/python/Components/VolumeControl.py b/lib/python/Components/VolumeControl.py
index eef74d0e26da4679522f3b62068ab72505fc66c5..38102926ace9bdded3ba3be6508878c6747594a2 100644 (file)
--- a/lib/python/Components/VolumeControl.py
+++ b/lib/python/Components/VolumeControl.py
@@ -5,22 +5,20 @@ from Screens.Mute import Mute
 from GlobalActions import globalActionMap
 from config import config, ConfigSubsection, ConfigInteger
 
-instance = None
-
 profile("VolumeControl")
 #TODO .. move this to a own .py file
 class VolumeControl:
+       instance = None
        """Volume control, handles volUp, volDown, volMute actions and display
        a corresponding dialog"""
        def __init__(self, session):
                global globalActionMap
-               global instance
                globalActionMap.actions["volumeUp"]=self.volUp
                globalActionMap.actions["volumeDown"]=self.volDown
                globalActionMap.actions["volumeMute"]=self.volMute
 
-               assert not instance, "only one VolumeControl instance is allowed!"
-               instance = self
+               assert not VolumeControl.instance, "only one VolumeControl instance is allowed!"
+               VolumeControl.instance = self
 
                config.audio = ConfigSubsection()
                config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))