Merge 758ea80 into 3d4a0a8

mltony · web-flow · commit 5f97586b17b4 · 2024-04-16T11:32:20.000-07:00
diff --git a/source/audio/soundSplit.py b/source/audio/soundSplit.py
@@ -212,13 +212,13 @@ def setSoundSplitState(
 			# We need to restore volume of all applications, but then don't set up callback for future audio sessions
 			state = SoundSplitState.NVDA_BOTH_APPS_BOTH
 			applyToFuture = False
+			appsVolume = appsVolume or 1.0
 	leftVolume, rightVolume = state.getAppVolume()
 	if appsVolume is None:
 		appsVolume = (
 			config.conf["audio"]["applicationsSoundVolume"] / 100
 			* (1 - int(config.conf["audio"]["applicationsMuted"]))
 		)
-
 	leftVolume *= appsVolume
 	rightVolume *= appsVolume
 	leftNVDAVolume, rightNVDAVolume = state.getNVDAVolume()
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -4520,6 +4520,12 @@ def script_cycleSoundSplit(self, gesture: "inputCore.InputGesture") -> None:
 		gesture="kb:NVDA+alt+pageUp",
 	)
 	def script_increaseApplicationsVolume(self, gesture: "inputCore.InputGesture") -> None:
+		state = audio.soundSplit.SoundSplitState(config.conf["audio"]["soundSplitState"])
+		if state == audio.soundSplit.SoundSplitState.OFF:
+			# Translators: An error message while trying to adjust applications volume
+			msg = _("Please enable sound split to use this command")
+			ui.message(msg)
+			return
 		volume = config.conf["audio"]["applicationsSoundVolume"]
 		volume = min(100, volume + 5)
 		config.conf["audio"]["applicationsSoundVolume"] = volume
@@ -4538,6 +4544,12 @@ def script_increaseApplicationsVolume(self, gesture: "inputCore.InputGesture") -
 		gesture="kb:NVDA+alt+pageDown",
 	)
 	def script_decreaseApplicationsVolume(self, gesture: "inputCore.InputGesture") -> None:
+		state = audio.soundSplit.SoundSplitState(config.conf["audio"]["soundSplitState"])
+		if state == audio.soundSplit.SoundSplitState.OFF:
+			# Translators: An error message while trying to adjust applications volume
+			msg = _("Please enable sound split to use this command")
+			ui.message(msg)
+			return
 		volume = config.conf["audio"]["applicationsSoundVolume"]
 		volume = max(0, volume - 5)
 		config.conf["audio"]["applicationsSoundVolume"] = volume
@@ -4556,6 +4568,12 @@ def script_decreaseApplicationsVolume(self, gesture: "inputCore.InputGesture") -
 		gesture="kb:NVDA+alt+delete",
 	)
 	def script_toggleApplicationsMute(self, gesture: "inputCore.InputGesture") -> None:
+		state = audio.soundSplit.SoundSplitState(config.conf["audio"]["soundSplitState"])
+		if state == audio.soundSplit.SoundSplitState.OFF:
+			# Translators: An error message while trying to adjust applications volume
+			msg = _("Please enable sound split to use this command")
+			ui.message(msg)
+			return
 		muted = config.conf["audio"]["applicationsMuted"]
 		muted = not muted
 		config.conf["audio"]["applicationsMuted"] = muted
