Merge branch '2024compat' into dev

addon/globalPlugins/soundSplitter/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Sound Splitter add-on
 # Originally part of Tony's Enhancements add-on
-# Copyright: 2022, Joseph Lee. 2023, Luke Davis.
+# Copyright: 2022, Joseph Lee. 2023-2024, Luke Davis.
 # Tony's Enhancements copyright (C) 2019 Tony Malykh
 # This file is covered by the GNU General Public License version 2.
 # See the file LICENSE for more details.
@@ -65,7 +65,7 @@ def reallyCheck_isUsingWASAPI() -> bool:
 			else:
 				usingWASAPI = config.conf["audio"]["wasapi"]
 		else:
-			usingWASAPI = config.conf["audio"]["WASAPI"]
+			usingWASAPI = config.conf["audio"]["WASAPI"].__bool__()
 		return usingWASAPI
 	# If this is the first run, establish the state for all future runs
 	if _usingWASAPIAtStartup is None:

addon/installTasks.py

@@ -1,5 +1,5 @@
 # SoundSplitter/installTasks.py
-# Copyright: 2022, Joseph Lee. 2023, Luke Davis. Released under GPL V2.
+# Copyright: 2022, Joseph Lee. 2023-2024, Luke Davis. Released under GPL V2.
 
 # Provides needed routines during add-on installation and removal.
 # Mostly checks compatibility.
@@ -38,3 +38,18 @@ def onInstall():
 				), unsupportedWindowsReleaseTitle, wx.OK | wx.ICON_ERROR
 			)
 		raise RuntimeError("Attempting to install Sound Splitter on unsupported Windows release.")
+	# Notify about sound split feature in 2024.2 versions of NVDA
+	gui.messageBox(
+		_(
+			# Translators: a message shown on upgrade/installation, notifying about built in sound split feature.
+			"Notice to users of NVDA alpha and beta versions.\n"
+			"The sound split feature is being integrated into NVDA itself, as of NVDA 2024.2.\n"
+			"However, this is only applicable to those using WASAPI for their sound interface.\n"
+			"While WASAPI is the default in modern versions of NVDA, this add-on is still necessary if you "
+			"wish to use sound split without WASAPI, and will be maintained for that purpose, and "
+			"for use in older versions of NVDA."
+		), _(
+			# Translators: title of a dialog notifying about upcoming WASAPI sound split support.
+			"Notice About Built-in WASAPI Sound Split Support"
+		), wx.OK | wx.ICON_WARNING
+	)

buildVars.py

@@ -25,7 +25,7 @@ def _(arg):
 	# Translators: Long description to be shown for this add-on on add-on information from add-ons manager
 	"addon_description": _("Splits sound from NvDA screen reader and other programs to separate channels"),
 	# version
-	"addon_version": "23.5.10",
+	"addon_version": "23.5.11",
 	# Author(s)
 	"addon_author": "Luke Davis <XLTechie@newanswertech.com>, Joseph Lee <joseph.lee22590@gmail.com>",
 	# URL for the add-on documentation support
@@ -37,7 +37,7 @@ def _(arg):
 	# Minimum NVDA version supported (e.g. "2018.3.0", minor version is optional)
 	"addon_minimumNVDAVersion": "2022.4",
 	# Last NVDA version supported/tested (e.g. "2018.4.0", ideally more recent than minimum version)
-	"addon_lastTestedNVDAVersion": "2023.3",
+	"addon_lastTestedNVDAVersion": "2024.1",
 	# Add-on update channel (default is None, denoting stable releases,
 	# and for development releases, use "dev".)
 	# Do not change unless you know what you are doing!

changelog.md

@@ -1,5 +1,11 @@
 # Changelog:
 
+### 24.1.0
+
+* Compatibility with NVDA 2024.1.
+* Emits a notice on installation, that WASAPI sound split feature is available in NVDA 2024.2 and its alphas/betas.
+* Fixes a bug with WASAPI state detection in NVDA 2024.1 and later.
+
 ### 23.5.8
 
 Hotfix for WASAPI detection, contributed by @CyrilleB79: