diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2014-11-13 23:28:41 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2014-11-13 23:28:41 +0100 |
commit | 19663c823698e1a366e82670c334e1cda871bb95 (patch) | |
tree | d641d00c65248b63a855870f4d4605d6cf91fbca /src/effects/effectchain.h | |
parent | 6a71c26c89079298dbd274c54f31a5e3cf32f058 (diff) |
Revert "user plain pointers for Effect, this fixes a segfault due to double delete when using more than one EffectRack"
This reverts commit 2454bb037ceb79726a983ff4b57345beae53f8f5.
Conflicts:
src/effects/effect.cpp
src/effects/effectchain.cpp
src/effects/effectchain.h
src/effects/effectchainslot.cpp
src/effects/effectchainslot.h
src/effects/effectparameter.cpp
src/effects/effectsbackend.cpp
src/effects/effectsbackend.h
src/effects/effectslot.cpp
src/effects/effectslot.h
Diffstat (limited to 'src/effects/effectchain.h')
-rw-r--r-- | src/effects/effectchain.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/effectchain.h b/src/effects/effectchain.h index 0744e7cbdd..30e16da50d 100644 --- a/src/effects/effectchain.h +++ b/src/effects/effectchain.h @@ -84,10 +84,10 @@ class EffectChain : public QObject { InsertionType insertionType() const; void setInsertionType(InsertionType type); - void addEffect(Effect* pEffect); - void replaceEffect(unsigned int effectSlotNumber, Effect* pEffect); + void addEffect(EffectPointer pEffect); + void replaceEffect(unsigned int effectSlotNumber, EffectPointer pEffect); void removeEffect(unsigned int effectSlotNumber); - const QList<Effect*>& effects() const; + const QList<EffectPointer>& effects() const; unsigned int numEffects() const; EngineEffectChain* getEngineEffectChain(); @@ -125,7 +125,7 @@ class EffectChain : public QObject { double m_dMix; QSet<QString> m_enabledGroups; - QList<Effect*> m_effects; + QList<EffectPointer> m_effects; EngineEffectChain* m_pEngineEffectChain; bool m_bAddedToEngine; |