From a666df0e564d30acaf1505897b246974e86e2dea Mon Sep 17 00:00:00 2001 From: Vesa Date: Sat, 15 Mar 2014 21:37:35 +0200 Subject: [PATCH] Fix incorrect loading/saving of models on all native effect plugins. Backwards compatible. --- plugins/BassBooster/BassBoosterControls.cpp | 12 +++++------ .../dynamics_processor_controls.cpp | 20 +++++++++---------- .../stereoenhancer_controls.cpp | 4 ++-- .../stereo_matrix/stereomatrix_controls.cpp | 16 +++++++-------- plugins/waveshaper/waveshaper_controls.cpp | 10 +++++----- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/plugins/BassBooster/BassBoosterControls.cpp b/plugins/BassBooster/BassBoosterControls.cpp index f1c7184c8..321d6dd22 100644 --- a/plugins/BassBooster/BassBoosterControls.cpp +++ b/plugins/BassBooster/BassBoosterControls.cpp @@ -81,9 +81,9 @@ void BassBoosterControls::changeRatio() void BassBoosterControls::loadSettings( const QDomElement& _this ) { - m_freqModel.setValue( _this.attribute( "freq" ).toFloat() ); - m_gainModel.setValue( _this.attribute( "gain" ).toFloat() ); - m_ratioModel.setValue( _this.attribute( "ratio" ).toFloat() ); + m_freqModel.loadSettings( _this, "freq" ); + m_gainModel.loadSettings( _this, "gain" ); + m_ratioModel.loadSettings( _this, "ratio"); } @@ -91,9 +91,9 @@ void BassBoosterControls::loadSettings( const QDomElement& _this ) void BassBoosterControls::saveSettings( QDomDocument& doc, QDomElement& _this ) { - _this.setAttribute( "freq", m_freqModel.value() ); - _this.setAttribute( "gain", m_gainModel.value() ); - _this.setAttribute( "ratio", m_ratioModel.value() ); + m_freqModel.saveSettings( doc, _this, "freq" ); + m_gainModel.saveSettings( doc, _this, "gain" ); + m_ratioModel.saveSettings( doc, _this, "ratio"); } diff --git a/plugins/dynamics_processor/dynamics_processor_controls.cpp b/plugins/dynamics_processor/dynamics_processor_controls.cpp index 614aed8e9..6d0a34672 100644 --- a/plugins/dynamics_processor/dynamics_processor_controls.cpp +++ b/plugins/dynamics_processor/dynamics_processor_controls.cpp @@ -86,11 +86,11 @@ void dynProcControls::samplesChanged( int _begin, int _end) void dynProcControls::loadSettings( const QDomElement & _this ) { //load knobs, stereomode - m_inputModel.setValue( _this.attribute( "inputGain" ).toFloat() ); - m_outputModel.setValue( _this.attribute( "outputGain" ).toFloat() ); - m_attackModel.setValue( _this.attribute( "attack" ).toFloat() ); - m_releaseModel.setValue( _this.attribute( "release" ).toFloat() ); - m_stereomodeModel.setValue( _this.attribute( "stereoMode" ).toInt() ); + m_inputModel.loadSettings( _this, "inputGain" ); + m_outputModel.loadSettings( _this, "outputGain" ); + m_attackModel.loadSettings( _this, "attack" ); + m_releaseModel.loadSettings( _this, "release" ); + m_stereomodeModel.loadSettings( _this, "stereoMode" ); //load waveshape int size = 0; @@ -109,11 +109,11 @@ void dynProcControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) { //save input, output knobs - _this.setAttribute( "inputGain", m_inputModel.value() ); - _this.setAttribute( "outputGain", m_outputModel.value() ); - _this.setAttribute( "attack", m_attackModel.value() ); - _this.setAttribute( "release", m_releaseModel.value() ); - _this.setAttribute( "stereoMode", m_stereomodeModel.value() ); + m_inputModel.saveSettings( _doc, _this, "inputGain" ); + m_outputModel.saveSettings( _doc, _this, "outputGain" ); + m_attackModel.saveSettings( _doc, _this, "attack" ); + m_releaseModel.saveSettings( _doc, _this, "release" ); + m_stereomodeModel.saveSettings( _doc, _this, "stereoMode" ); //save waveshape diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.cpp b/plugins/stereo_enhancer/stereoenhancer_controls.cpp index 8f6941156..4ea92c65e 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_controls.cpp @@ -51,7 +51,7 @@ void stereoEnhancerControls::changeWideCoeff() void stereoEnhancerControls::loadSettings( const QDomElement & _this ) { - m_widthModel.setValue( _this.attribute( "width" ).toFloat() ); + m_widthModel.loadSettings( _this, "width" ); } @@ -60,7 +60,7 @@ void stereoEnhancerControls::loadSettings( const QDomElement & _this ) void stereoEnhancerControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) { - _this.setAttribute( "width", m_widthModel.value() ); + m_widthModel.saveSettings( _doc, _this, "width" ); } diff --git a/plugins/stereo_matrix/stereomatrix_controls.cpp b/plugins/stereo_matrix/stereomatrix_controls.cpp index 6353063fd..69f60e7c9 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.cpp +++ b/plugins/stereo_matrix/stereomatrix_controls.cpp @@ -59,10 +59,10 @@ void stereoMatrixControls::changeMatrix() void stereoMatrixControls::loadSettings( const QDomElement & _this ) { - m_llModel.setValue( _this.attribute( "l-l" ).toFloat() ); - m_lrModel.setValue( _this.attribute( "l-r" ).toFloat() ); - m_rlModel.setValue( _this.attribute( "r-l" ).toFloat() ); - m_rrModel.setValue( _this.attribute( "r-r" ).toFloat() ); + m_llModel.loadSettings( _this, "l-l" ); + m_lrModel.loadSettings( _this, "l-r" ); + m_rlModel.loadSettings( _this, "r-l" ); + m_rrModel.loadSettings( _this, "r-r" ); } @@ -71,10 +71,10 @@ void stereoMatrixControls::loadSettings( const QDomElement & _this ) void stereoMatrixControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) { - _this.setAttribute( "l-l", m_llModel.value() ); - _this.setAttribute( "l-r", m_lrModel.value() ); - _this.setAttribute( "r-l", m_rlModel.value() ); - _this.setAttribute( "r-r", m_rrModel.value() ); + m_llModel.saveSettings( _doc, _this, "l-l" ); + m_lrModel.saveSettings( _doc, _this, "l-r" ); + m_rlModel.saveSettings( _doc, _this, "r-l" ); + m_rrModel.saveSettings( _doc, _this, "r-r" ); } diff --git a/plugins/waveshaper/waveshaper_controls.cpp b/plugins/waveshaper/waveshaper_controls.cpp index dd06f75e4..39e30d273 100644 --- a/plugins/waveshaper/waveshaper_controls.cpp +++ b/plugins/waveshaper/waveshaper_controls.cpp @@ -88,8 +88,8 @@ void waveShaperControls::samplesChanged( int _begin, int _end) void waveShaperControls::loadSettings( const QDomElement & _this ) { //load input, output knobs - m_inputModel.setValue( _this.attribute( "inputGain" ).toFloat() ); - m_outputModel.setValue( _this.attribute( "outputGain" ).toFloat() ); + m_inputModel.loadSettings( _this, "inputGain" ); + m_outputModel.loadSettings( _this, "outputGain" ); m_clipModel.loadSettings( _this, "clipInput" ); @@ -110,9 +110,9 @@ void waveShaperControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) { //save input, output knobs - _this.setAttribute( "inputGain", m_inputModel.value() ); - _this.setAttribute( "outputGain", m_outputModel.value() ); - + m_inputModel.saveSettings( _doc, _this, "inputGain" ); + m_outputModel.saveSettings( _doc, _this, "outputGain" ); + m_clipModel.saveSettings( _doc, _this, "clipInput" ); //save waveshape