Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Effects Refactoring #1705

Closed
wants to merge 47 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
052fd74
Consolidated EffectChain and EffectChainSlot
kshitij98 Jun 5, 2018
5502ecd
Removed EffectChainManager layer
kshitij98 Jun 16, 2018
a7cd3a7
Removed EngineEffectRack layer
kshitij98 Jun 18, 2018
fcbca5d
Removed EffectRack layer
kshitij98 Jun 27, 2018
e7a510c
Consolidated Effect and EffectSlot
kshitij98 Jul 7, 2018
e8626e9
[WIP] Updated Effect tests
kshitij98 Jul 17, 2018
95a8af8
use shared pointers for EngineEffectParameters
Be-ing Jul 13, 2018
b7a0ec0
decouple EffectProcessor construction from EngineEffect
Be-ing Jul 13, 2018
e13af95
store EffectsBackends in a QHash indexed by EffectBackendType
Be-ing Jul 17, 2018
c367207
pass EffectProcessor instead of EffectInstantiator to EngineEffect
Be-ing Jul 17, 2018
70fce49
make LV2EffectProcessor a subclass of EffectProcessorImpl
Be-ing Jul 15, 2018
09a338b
make LV2EffectManifest a subclass of EffectManifest
Be-ing Jul 15, 2018
bbc9a9e
activate and deactivate LV2 effect plugins appropriately
Be-ing Jul 15, 2018
41ef6b6
fix crash on shutdown when an LV2 effect was loaded
Be-ing Jul 15, 2018
bddd3d4
remove unused function parameter
Be-ing Jul 15, 2018
aa4e1d3
use EffectManifests instead of QString IDs to identify effects
Be-ing Jul 17, 2018
ec33535
Added Qt 5.5.1 support
kshitij98 Jul 19, 2018
4cd7a28
Removed redundancy from EffectParameter and EffectParameterSlot
kshitij98 Jul 21, 2018
766071c
Added EffectParameter and EffectParameterSlot class comments
kshitij98 Aug 1, 2018
e292e63
Renamed EffectParameterSlotPointer to EffectKnobParameterSlotPointer
kshitij98 Aug 1, 2018
2ac9eb3
Renamed m_parameterSlots -> m_knobParameterSlots
kshitij98 Aug 1, 2018
3a8052f
Renamed EffectParameterSlot -> EffectKnobParameterSlot
kshitij98 Aug 2, 2018
a526371
Renamed m_buttonParameters -> m_buttonParameterSlots
kshitij98 Aug 3, 2018
94e983c
Effect Parameter Hiding/Rearrangement
kshitij98 Aug 3, 2018
a1091b6
Reduced Effect Parameter Code Duplicacy
kshitij98 Aug 28, 2018
67d4e81
Renamed ControlHint->ValueScaler and EffectParameterType->ParameterType
kshitij98 Oct 11, 2018
089ef37
Added ControlNumParameters
kshitij98 Oct 12, 2018
d170308
Moved to initialiser list
kshitij98 Dec 29, 2018
831daef
Renamed m_parameterSlotPositionToManifestIndex -> m_mapForParameterType
kshitij98 Dec 29, 2018
ae6339c
Removed spacing between "> ("
kshitij98 Dec 29, 2018
66f09fc
Renamed iParameter -> parameterSlotIndex
kshitij98 Dec 29, 2018
45d49dc
Cleared Parameter Mappings
kshitij98 Dec 29, 2018
645cb7e
Added TODO: reimplement slotEffectSelector
kshitij98 Dec 29, 2018
6c56531
Renamed m_pSoftTakeover -> m_pMetaknobSoftTakeover
kshitij98 Dec 29, 2018
93b9fd2
Fixed inheritence in parameter slots
kshitij98 Dec 29, 2018
584bb6a
Merge branch 'master' into effects_refactoring
kshitij98 Dec 29, 2018
5527c03
function pointers for signal-slot connections in effects system
Be-ing Dec 29, 2018
cdd440e
Removed redundant block from switch case
kshitij98 Jan 2, 2019
1345726
Added comment in load Parameter
kshitij98 Jan 2, 2019
b9b1429
Removed EffectSlot::getEngineEffect()
kshitij98 Jan 2, 2019
b9605cc
Merge pull request #10 from Be-ing/effects_refactoring
kshitij98 Jan 2, 2019
c672bbd
Added assertion parameterSlotIndex < numParameterSlots
kshitij98 Jan 2, 2019
acf0f4f
Added comment in EffectParameter
kshitij98 Jan 2, 2019
73fecb7
Shifted slotValueChanged to EffectParameterSlotBase
kshitij98 Feb 11, 2019
d7d5657
Simplified parameter value updates
kshitij98 Feb 12, 2019
2ef7b92
Merge remote-tracking branch 'upstream/master' into effects_refactoring
kshitij98 Feb 12, 2019
2fab19a
Added Effect Preset classes
kshitij98 Feb 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/effects/effectslot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,33 +316,36 @@ void EffectSlot::loadParameters() {

m_pControlNumParameters[parameterType]->forceSet(numParameters(parameterType));

unsigned int iParameter = 0;
unsigned int parameterSlotIndex = 0;
unsigned int numParameterSlots = m_iNumParameterSlots[parameterType];
for (int i=0 ; i<m_mapForParameterType[parameterType].size() ; ++i) {
kshitij98 marked this conversation as resolved.
Show resolved Hide resolved
const int iParameterPosition = m_mapForParameterType[parameterType].value(i, -1);
const int manifestIndex = m_mapForParameterType[parameterType].value(i, -1);

auto pParameter = m_parameters.value(iParameterPosition, nullptr);
auto pParameter = m_parameters.value(manifestIndex, nullptr);

VERIFY_OR_DEBUG_ASSERT(pParameter != nullptr) {
continue;
}

if (iParameter < numParameterSlots) {
auto pParameterSlot = getEffectParameterSlot(parameterType, iParameter);
while (parameterSlotIndex < numParameterSlots) {
Be-ing marked this conversation as resolved.
Show resolved Hide resolved
auto pParameterSlot = getEffectParameterSlot(parameterType, parameterSlotIndex);
VERIFY_OR_DEBUG_ASSERT(pParameterSlot != nullptr) {
break;
++parameterSlotIndex;
continue;
}
pParameterSlot->loadParameter(pParameter);
++iParameter;
++parameterSlotIndex;
break;
}
}
while (iParameter < numParameterSlots) {
auto pParameterSlot = getEffectParameterSlot(parameterType, iParameter);
while (parameterSlotIndex < numParameterSlots) {
kshitij98 marked this conversation as resolved.
Show resolved Hide resolved
auto pParameterSlot = getEffectParameterSlot(parameterType, parameterSlotIndex);
VERIFY_OR_DEBUG_ASSERT(pParameterSlot != nullptr) {
break;
++parameterSlotIndex;
continue;
}
pParameterSlot->clear();
++iParameter;
++parameterSlotIndex;
}
}
}
Expand Down