Properly Handle mismatch between Presets and EffectUnits with different amount of Effect slots #11424
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
daschuer
requested changes
Mar 31, 2023
src/effects/effectchain.cpp
Outdated
Comment on lines
212
to
213
| const std::size_t validPresetSlotCount = std::min(effectPresets.count(), m_effectSlots.count()); | ||
| for (std::size_t presetSlotIndex = 0; |
There was a problem hiding this comment.
QT uses int for sized from Qt6 it is qsizetype which is ssize_t
Suggested change
| const std::size_t validPresetSlotCount = std::min(effectPresets.count(), m_effectSlots.count()); | |
| for (std::size_t presetSlotIndex = 0; | |
| const int validPresetSlotCount = std::min(effectPresets.count(), m_effectSlots.count()); | |
| for (int presetSlotIndex = 0; |
This avoids a warning in MSVC
src/effects/effectchain.cpp
Outdated
| const QList effectPresets = pChainPreset->effectPresets(); | ||
|
|
||
| // TODO: use C++23 std::ranges::views::zip instead | ||
| const std::size_t validPresetSlotCount = std::min(effectPresets.count(), m_effectSlots.count()); |
There was a problem hiding this comment.
Can you add a comment about why the case effectPresets.count() != m_effectSlots.count() can happen?
|
fyi, ping me before merging so I can autosquash the fixup commit |
daschuer
approved these changes
Mar 31, 2023
Only load effect preset from chain presets to slots that actually have been created. The rest gets ignored.
|
@daschuer ready |
|
@daschuer friendly ping |
|
Oh, sorry this slipped through. |
|
No worries 👍 |
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 #11376
However, it does not address the question whether the EQ should be implemented in terms of an EffectChain