Sound proxy fix and clean up #4584
Merged
Conversation
This file contains 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
|
Please rebase on main |
|
As a first step I suggest to get rid of m_pAudioSource that is not needed. I will prepare a PR. Bigger refactorings should be done afterwards, step by step. |
963ff03 to
8b18970
Compare
|
Done |
8b18970 to
bffe627
Compare
This fixes lp1955840 for more than two SoundSources per file extension
bffe627 to
095110a
Compare
uklotzde
reviewed
Jan 1, 2022
src/sources/soundsourceproxy.h
Outdated
| @@ -196,11 +200,12 @@ class SoundSourceProxy { | |||
| // provider and is initialized with -1 if no | |||
| int m_providerRegistrationIndex; | |||
|
|
|||
| void initSoundSource( | |||
| const mixxx::SoundSourceProviderPointer& pProvider); | |||
| void findAndInitSoundSource(); | |||
There was a problem hiding this comment.
findProviderAndInitSoundSource()
src/sources/soundsourceproxy.cpp
Outdated
| VERIFY_OR_DEBUG_ASSERT(m_pTrack) { | ||
| return nullptr; | ||
| } | ||
| if (openSoundSource(params)) { |
There was a problem hiding this comment.
Prefer a linear control flow for the regular path:
if (!openSoundSource(params)) {
return nullptr;
}
...
src/sources/soundsourceproxy.h
Outdated
| const mixxx::SoundSourceProviderPointer& pProvider); | ||
| void findAndInitSoundSource(); | ||
|
|
||
| bool initSoundSource( |
There was a problem hiding this comment.
initSoundSourceWithProvider()
|
Done |
uklotzde
approved these changes
Jan 2, 2022
This was referenced Aug 23, 2022
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.
This fixes https://bugs.launchpad.net/mixxx/+bug/1955840 and improves the readability of the initializing phase.
This is the refactoring for https://bugs.launchpad.net/mixxx/+bug/1955331 moved to the main branch to lower the risk for the stable 2.3 branch.