Revert "sapi5: skip over invalid voices rather than causing the entire driver to fail" - #20464
Merged
Conversation
…e driver…" This reverts commit 4ab8dd0.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts the earlier SAPI5 change that enumerated voice tokens via the registry to tolerate malformed/invalid voices, restoring the previous behavior that relies on SAPI’s built-in voice enumeration.
Changes:
- Removes the changelog entry describing the “skip invalid SAPI5 voices” behavior.
- Deletes the registry-based voice-token enumeration/token creation logic.
- Restores
tts.GetVoices()usage and updates voice selection to match by enumerated tokenId.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| user_docs/en/changes.md | Removes the release note for the reverted SAPI5 robustness change. |
| source/synthDrivers/sapi5.py | Reverts SAPI5 voice-token handling back to GetVoices() and removes registry/token creation helpers. |
Comment on lines
633
to
635
| except COMError: | ||
| log.warning("Could not get the voice info. Skipping...") | ||
| continue | ||
| voices[ID] = VoiceInfo(ID, name, language) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts PR
Reverts #20430
Issues fixed
N/A
Issues reopened
Reopens #20128
Reason for revert
Can this PR be reimplemented? If so, what is required for the next attempt