diff --git a/include/PeakController.h b/include/PeakController.h index b56c4c1a5..96240c6df 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -54,7 +54,6 @@ public: virtual QString nodeName() const; static PeakControllerEffectVector s_effects; - static int s_lastEffectId; public slots: diff --git a/plugins/peak_controller_effect/peak_controller_effect.cpp b/plugins/peak_controller_effect/peak_controller_effect.cpp index 4069c941b..0d8238262 100644 --- a/plugins/peak_controller_effect/peak_controller_effect.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect.cpp @@ -31,7 +31,6 @@ #include "embed.cpp" - extern "C" { @@ -61,6 +60,7 @@ PeakControllerEffect::PeakControllerEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : Effect( &peakcontrollereffect_plugin_descriptor, _parent, _key ), + m_effectId( rand() ), m_peakControls( this ), m_lastSample( 0 ), m_lastRMS( -1 ), diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp index 740b2c416..18d66a417 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp @@ -62,10 +62,6 @@ void PeakControllerEffectControls::loadSettings( const QDomElement & _this ) m_amountMultModel.loadSettings( _this, "amountmult" ); int effectId = _this.attribute( "effectId" ).toInt(); - if( effectId > PeakController::s_lastEffectId ) - { - PeakController::s_lastEffectId = effectId; - } m_effect->m_effectId = effectId; if( m_effect->m_autoController && ( engine::getSong()->isLoadingProject() == true || presetPreviewPlayHandle::isPreviewing() == false ) ) diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp index 7d5407df0..91d567a06 100644 --- a/src/core/PeakController.cpp +++ b/src/core/PeakController.cpp @@ -37,7 +37,6 @@ #include "ControllerDialog.h" #include "plugins/peak_controller_effect/peak_controller_effect.h" -int PeakController::s_lastEffectId = 0; PeakControllerEffectVector PeakController::s_effects;