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.
This PR aims to remove a lot of static globals, associating the data with each backend instance instead of using a
HashMap
and indexing it with the backend ID. I haven't run any benchmarks, but this should be more optimal as it uses many fewerMutex
es, and it uses no hashmaps at all.In the case of WinRT, it also removes a lot of code duplicated between
WinRt::speak
and theMediaPlayer::MediaEnded
callback.I am sure that other globals like
CALLBACKS
,NEXT_BACKEND_ID
andNEXT_UTTERANCE_ID
, as well as theBackendId
struct could be removed, but I wanted to get the green light first.Of course, I'm also interested in implementing the other backends.
This also fixes #29, but if it is not merged, I can create another PR that only contains the fix.