Remove winmm support from NVDA

source/audio/appsVolume.py

@@ -104,13 +104,6 @@ def _updateAppsVolumeImpl(
 	_activeCallback.register()
 
 
-_WASAPI_DISABLED_MESSAGE: str = _(
-	# Translators: error message when wasapi is turned off.
-	"Application volume cannot be controlled by NVDA when WASAPI is disabled. "
-	"Please enable it in the advanced settings panel.",
-)
-
-
 _VOLUME_ADJUSTMENT_DISABLED_MESSAGE: str = _(
 	# Translators: error message when applications' volume is disabled
 	"Application volume control disabled",

source/nvwave.py

@@ -6,6 +6,7 @@
 
 """Provides a simple Python interface to playing audio using the Windows multimedia waveOut functions, as well as other useful utilities."""
 
+from collections.abc import Iterator
 import threading
 import typing
 from typing import (
@@ -99,9 +100,9 @@ class AudioPurpose(Enum):
 	SOUNDS = auto()
 
 
-def _getOutputDevices():
-	"""Generator, returning device ID and device Name in device ID order.
-	@note: Depending on number of devices being fetched, this may take some time (~3ms)
+def _getOutputDevices() -> Iterator[tuple[str, str]]:
+	"""Generator, yielding device ID and device Name in device ID order.
+	..note: Depending on number of devices being fetched, this may take some time (~3ms)
 	"""
 	endpointCollection = AudioUtilities.GetDeviceEnumerator().EnumAudioEndpoints(
 		EDataFlow.eRender.value,
@@ -116,35 +117,30 @@ def _getOutputDevices():
 			continue
 
 
-def getOutputDeviceNames():
+def getOutputDeviceNames() -> list[str]:
 	"""Obtain the names of all audio output devices on the system.
-	@return: The names of all output devices on the system.
-	@rtype: [str, ...]
-	@note: Depending on number of devices being fetched, this may take some time (~3ms)
+	:return: The names of all output devices on the system.
+	..note: Depending on number of devices being fetched, this may take some time (~3ms)
 	"""
 	return [name for ID, name in _getOutputDevices()]
 
 
-def outputDeviceIDToName(ID):
+def outputDeviceIDToName(ID: str) -> str:
 	"""Obtain the name of an output device given its device ID.
-	@param ID: The device ID.
-	@type ID: int
-	@return: The device name.
-	@rtype: str
+	:param ID: The device ID.
+	:return: The device name.
 	"""
 	device = AudioUtilities.GetDeviceEnumerator().GetDevice(id)
 	return AudioUtilities.CreateDevice(device).FriendlyName
 
 
-def outputDeviceNameToID(name: str, useDefaultIfInvalid=False) -> int:
+def outputDeviceNameToID(name: str, useDefaultIfInvalid: bool = False) -> str:
 	"""Obtain the device ID of an output device given its name.
-	@param name: The device name.
-	@param useDefaultIfInvalid: C{True} to use the default device (wave mapper) if there is no such device,
-		C{False} to raise an exception.
-	@return: The device ID.
-	@raise LookupError: If there is no such device and C{useDefaultIfInvalid} is C{False}.
-	@note: Depending on number of devices, and the position of the device in the list,
-	this may take some time (~3ms)
+	:param name: The device name.
+	:param useDefaultIfInvalid: `True` to use the default device if there is no such device, `False` to raise an exception.
+	:return: The device ID.
+	:raise LookupError: If there is no such device and `useDefaultIfInvalid` is `False`.
+	..note: Depending on number of devices, and the position of the device in the list, this may take some time (~3ms)
 	"""
 	for curID, curName in _getOutputDevices():
 		if curName == name:
@@ -571,7 +567,7 @@ def _isDefaultDevice(cls, name):
 
 WavePlayer = WasapiWavePlayer
 fileWavePlayer: Optional[WavePlayer] = None
-fileWavePlayerThread = None
+fileWavePlayerThread: threading.Thread | None = None
 
 
 def initialize():