X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f41db3fa4eab2943b6f5e75aac891db51f3e9ce1..19d19912b3f7ff117f4f9e8136c428b664d806cb:/mytest.py

diff --git a/mytest.py b/mytest.py
index 5b3258d1..d58649cf 100644
--- a/mytest.py
+++ b/mytest.py
@@ -7,7 +7,7 @@ from Tools.Profile import profile, profile_final
 
 profile("PYTHON_START")
 
-from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
 	getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
 from tools import *
 
@@ -314,87 +314,11 @@ class Session:
 		if self.summary is not None:
 			self.summary.show()
 
-from Screens.Volume import Volume
-from Screens.Mute import Mute
-from GlobalActions import globalActionMap
-
-profile("VolumeControl")
-#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 = ConfigInteger(default = 100, limits = (0, 100))
-
-		self.volumeDialog = session.instantiateDialog(Volume)
-		self.muteDialog = session.instantiateDialog(Mute)
-
-		self.hideVolTimer = eTimer()
-		self.hideVolTimer.callback.append(self.volHide)
-
-		vol = config.audio.volume.value
-		self.volumeDialog.setValue(vol)
-		self.volctrl = eDVBVolumecontrol.getInstance()
-		self.volctrl.setVolume(vol, vol)
-
-	def volSave(self):
-		if self.volctrl.isMuted():
-			config.audio.volume.value = 0
-		else:
-			config.audio.volume.value = self.volctrl.getVolume()
-		config.audio.volume.save()
-
-	def volUp(self):
-		self.setVolume(+1)
-
-	def volDown(self):
-		self.setVolume(-1)
-
-	def setVolume(self, direction):
-		oldvol = self.volctrl.getVolume()
-		if direction > 0:
-			self.volctrl.volumeUp()
-		else:
-			self.volctrl.volumeDown()
-		is_muted = self.volctrl.isMuted()
-		vol = self.volctrl.getVolume()
-		self.volumeDialog.show()
-		if is_muted:
-			self.volMute() # unmute
-		elif not vol:
-			self.volMute(False, True) # mute but dont show mute symbol
-		if self.volctrl.isMuted():
-			self.volumeDialog.setValue(0)
-		else:
-			self.volumeDialog.setValue(self.volctrl.getVolume())
-		self.volSave()
-		self.hideVolTimer.start(3000, True)
-
-	def volHide(self):
-		self.volumeDialog.hide()
-
-	def volMute(self, showMuteSymbol=True, force=False):
-		vol = self.volctrl.getVolume()
-		if vol or force:
-			self.volctrl.volumeToggleMute()
-			if self.volctrl.isMuted():
-				if showMuteSymbol:
-					self.muteDialog.show()
-				self.volumeDialog.setValue(0)
-			else:
-				self.muteDialog.hide()
-				self.volumeDialog.setValue(vol)
-
 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom
 import xml.dom.minidom
+from GlobalActions import globalActionMap
 
 class PowerKey:
 	""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -480,6 +404,9 @@ profile("Load:CI")
 from enigma import eDVBCIInterfaces
 from Screens.Ci import CiHandler
 
+profile("Load:VolumeControl")
+from Components.VolumeControl import VolumeControl
+
 def runScreenTest():
 	profile("readPluginList")
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))