Skip to content

NVDA driver compatibility with NVDA 2025.1 and older #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Olga-Yakovleva merged 3 commits into from
Mar 8, 2025
Merged

NVDA driver compatibility with NVDA 2025.1 and older #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e5e77a
Make NVDA driver compatible with future NVDA 2025.1 and the previous …
zstanecic Jan 6, 2025
d5d8aa5
Addressed review comments
zstanecic Jan 7, 2025
cb06aec
review action
zstanecic Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site_scons/RHVoicePackaging/nvda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __init__(self,name,outdir,env,display_name,summary,description,version,data_
if data_package:
self.set_string("lastTestedNVDAVersion", "2099.4.0")
else:
self.set_string("lastTestedNVDAVersion", "2024.1.0")
self.set_string("lastTestedNVDAVersion", "2025.1.0")

def build_manifest(self,lang=None):
if lang:
Expand Down
4 changes: 3 additions & 1 deletion src/nvda-addon/synthDriver/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

import addonAPIVersion
api_version = addonAPIVersion.CURRENT
import buildVersion

module_dir = os.path.dirname(__file__)
lib_path = os.path.join(module_dir, "RHVoice.dll")
Expand Down Expand Up @@ -189,7 +190,7 @@ def do_get_player(self):
return None
player = self.__players.get(self.__sample_rate, None)
if player is None:
player = nvwave.WavePlayer(channels=1, samplesPerSec=self.__sample_rate, bitsPerSample=16, outputDevice=config.conf["speech"]["outputDevice"])
player = nvwave.WavePlayer(channels=1, samplesPerSec=self.__sample_rate, bitsPerSample=16, outputDevice=self.__synth.outputDeviceSection["outputDevice"])
self.__players[self.__sample_rate] = player
return player

Expand Down Expand Up @@ -499,6 +500,7 @@ def __get_resource_paths(self):
def __init__(self):
self.__lib = load_tts_library()
self.__cancel_flag = threading.Event()
self.outputDeviceSection = config.conf["speech"] if buildVersion.version_year < 2025 else config.conf["audio"]
self.__player = AudioPlayer(self, self.__cancel_flag)
self.__sample_rate_callback = SampleRateCallback(self.__lib, self.__player)
self.__c_sample_rate_callback = RHVoice_callback_types.set_sample_rate(self.__sample_rate_callback)
Expand Down