Samplers: dont create extra empty players during startup #12657
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
ronso0
commented
Jan 27, 2024
| if (samplerNodes.isEmpty()) { | ||
| return true; | ||
| } | ||
| for (int i = 0; i < samplerNodes.size(); i++) { |
There was a problem hiding this comment.
I refactored this to avoid n = n.nextSibling(); before each continue.
Unfortunately there is no iterator for QDomNodeList.
daschuer
requested changes
Jan 27, 2024
src/mixer/samplerbank.cpp
Outdated
| // We also create new players even if they are not present in the | ||
| // GUI to not drop tracks loaded to invisible samplers when saving | ||
| // the samplers file. | ||
| if (m_pPlayerManager->numSamplers() < (unsigned)samplerNum) { |
There was a problem hiding this comment.
This way around should be more safe since samplerNum might be read from a corrupt file.
Suggested change
| if (m_pPlayerManager->numSamplers() < (unsigned)samplerNum) { | |
| if (static_cast<int>(m_pPlayerManager->numSamplers()) < samplerNum) { |
There was a problem hiding this comment.
Here is by the way also suspicious casting:
mixxx/src/mixer/playermanager.cpp
Line 278 in a7af572
Maybe we should just use int everywhere?
There was a problem hiding this comment.
You mean instead of unsigned int?
There was a problem hiding this comment.
Okay, I'll take a look and open another PR.
|
Works for me on Windows11! |
ronso0
commented
Jan 28, 2024
ronso0
force-pushed
the
samplers-dont-create-extra-empty-players
branch
from
a578814
to
5d299ef
Compare
ronso0
force-pushed
the
samplers-dont-create-extra-empty-players
branch
2 times, most recently
from
87c8342
to
186f166
Compare
daschuer
reviewed
Feb 5, 2024
daschuer
requested changes
Feb 5, 2024
ronso0
force-pushed
the
samplers-dont-create-extra-empty-players
branch
from
186f166
to
5a5d206
Compare
|
Now the menu is also updated if samplers or decks are added (skin change for example). |
This was referenced Feb 8, 2024
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.
Fixes #9115
If
samplers.xmlhas more empty(!) elements than sampler players have been created by request of either skins or controller mappings,SamplerBankwould trigger creation of all these unneeded samplers.This happened after having shutdown with a 64-samplers skin, and starting with a skin with less samplers, even though none of the additional samplers has a track loaded.
Additionally, I improved the track menu and the control picker menu (MIDI Learning Wizard):
in the "Load To" submenu samplers are now grouped into submenus with 16 samplers each.