Merge 7408817 into cdfda57

LeonarddeR · web-flow · commit 14bf331c6469 · 2019-12-03T21:33:25.000+10:00
diff --git a/source/core.py b/source/core.py
@@ -201,8 +201,8 @@ def _setInitialFocus():
 
 def main():
 	"""NVDA's core main loop.
-This initializes all modules such as audio, IAccessible, keyboard, mouse, and GUI. Then it initialises the wx application object and sets up the core pump, which checks the queues and executes functions when requested. Finally, it starts the wx main loop.
-"""
+	This initializes all modules such as audio, IAccessible, keyboard, mouse, and GUI. Then it initialises the wx application object and sets up the core pump, which checks the queues and executes functions when requested. Finally, it starts the wx main loop.
+	"""
 	log.debug("Core starting")
 
 	ctypes.windll.user32.SetProcessDPIAware()
@@ -224,6 +224,9 @@ def main():
 		except:
 			pass
 	logHandler.setLogLevelFromConfig()
+	log.debug("Initializing tones")
+	import tones
+	tones.initialize()
 	try:
 		lang = config.conf["general"]["language"]
 		import languageHandler
@@ -535,6 +538,9 @@ def run(self):
 	if updateCheck:
 		_terminate(updateCheck)
 
+	# Terminate tones early.
+	import tones
+	_terminate(tones)
 	_terminate(watchdog)
 	_terminate(globalPluginHandler, name="global plugin handler")
 	_terminate(gui)
diff --git a/source/tones.py b/source/tones.py
@@ -1,8 +1,7 @@
-#tones.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2007-2017 NV Access Limited, Aleksey Sadovoy
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2007-2017 NV Access Limited, Aleksey Sadovoy, Leonard de Ruijter
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 """Utilities to generate and play tones"""
 
@@ -15,16 +14,20 @@
 
 SAMPLE_RATE = 44100
 
-try:
-	player = nvwave.WavePlayer(channels=2, samplesPerSec=int(SAMPLE_RATE), bitsPerSample=16, outputDevice=config.conf["speech"]["outputDevice"],wantDucking=False)
-except:
-	log.warning("Failed to initialize audio for tones")
-	player = None
+player = None
+
+def initialize():
+	global player
+	try:
+		player = nvwave.WavePlayer(channels=2, samplesPerSec=int(SAMPLE_RATE), bitsPerSample=16, outputDevice=config.conf["speech"]["outputDevice"],wantDucking=False)
+	except:
+		log.warning("Failed to initialize audio for tones", exc_info=True)
+		player = None
 
 # When exiting, ensure player is deleted before modules get cleaned up.
 # Otherwise, WavePlayer.__del__ will fail with an exception.
 @atexit.register
-def _cleanup():
+def terminate():
 	global player
 	player = None
 
@@ -38,7 +41,7 @@ def beep(hz,length,left=50,right=50):
 	@type left: integer
 	@param right: volume of the right channel (0 to 100)
 	@type right: integer
-	""" 
+	"""
 	log.io("Beep at pitch %s, for %s ms, left volume %s, right volume %s"%(hz,length,left,right))
 	if not player:
 		return
