From f4cc0373210038b3534316cdf62a772817c5f2ad Mon Sep 17 00:00:00 2001 From: Mike Choi Date: Thu, 3 Jan 2013 21:57:56 +0100 Subject: [PATCH] VST Control: Right window title for parameter manual edit When you double-click on some knob to change its VST parameter value manually, new dialog window now has same title as what was that knobs name. (instead of "lmms" title string) Signed-off-by: Tobias Doerffel --- plugins/vestige/vestige.cpp | 16 ++++++++-------- plugins/vst_effect/VstEffectControls.cpp | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 192d58d33..32e82c252 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -128,7 +128,7 @@ void vestigeInstrument::loadSettings( const QDomElement & _this ) sprintf( paramStr, "param%d", i ); s_dumpValues = dump[ paramStr ].split( ":" ); - vstKnobs[i] = new knob( knobBright_26, widget ); + vstKnobs[i] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); vstKnobs[i]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); vstKnobs[i]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); @@ -916,21 +916,21 @@ manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrume } char paramStr[35]; - QStringList list1; + QStringList s_dumpValues; if (isVstKnobs == false) { for( int i = 0; i < m_vi->paramCount; i++ ) { sprintf( paramStr, "param%d", i); - list1 = dump[paramStr].split(":"); + s_dumpValues = dump[ paramStr ].split( ":" ); - m_vi->vstKnobs[i] = new knob( knobBright_26, this ); - m_vi->vstKnobs[i]->setHintText( list1.at(1) + ":", ""); - m_vi->vstKnobs[i]->setLabel( list1.at(1).left(15) ); + m_vi->vstKnobs[ i ] = new knob( knobBright_26, this, s_dumpValues.at( 1 ) ); + m_vi->vstKnobs[ i ]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); + m_vi->vstKnobs[ i ]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); sprintf( paramStr, "%d", i); - m_vi->knobFModel[i] = new FloatModel( (list1.at(2)).toFloat(), 0.0f, 1.0f, 0.01f, - castModel(), tr( paramStr ) ); + m_vi->knobFModel[ i ] = new FloatModel( (s_dumpValues.at( 2 )).toFloat(), + 0.0f, 1.0f, 0.01f, castModel(), tr( paramStr ) ); connect( m_vi->knobFModel[i], SIGNAL( dataChanged() ), this, SLOT( setParameter() ) ); m_vi->vstKnobs[i] ->setModel( m_vi->knobFModel[i] ); } diff --git a/plugins/vst_effect/VstEffectControls.cpp b/plugins/vst_effect/VstEffectControls.cpp index c8b0766cc..3b1fd16ce 100644 --- a/plugins/vst_effect/VstEffectControls.cpp +++ b/plugins/vst_effect/VstEffectControls.cpp @@ -80,7 +80,7 @@ void VstEffectControls::loadSettings( const QDomElement & _this ) sprintf( paramStr, "param%d", i ); s_dumpValues = dump[ paramStr ].split( ":" ); - vstKnobs[i] = new knob( knobBright_26, widget ); + vstKnobs[i] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); vstKnobs[i]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); vstKnobs[i]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); @@ -360,23 +360,24 @@ manageVSTEffectView::manageVSTEffectView( VstEffect * _eff, VstEffectControls * } char paramStr[35]; - QStringList list1; + QStringList s_dumpValues; if (isVstKnobs == false) { for( int i = 0; i < m_vi->paramCount; i++ ) { sprintf( paramStr, "param%d", i); - list1 = dump[paramStr].split(":"); + s_dumpValues = dump[ paramStr ].split( ":" ); - m_vi->vstKnobs[i] = new knob( knobBright_26, widget); - m_vi->vstKnobs[i]->setHintText( list1.at(1) + ":", ""); - m_vi->vstKnobs[i]->setLabel( list1.at(1).left(15) ); + m_vi->vstKnobs[ i ] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); + m_vi->vstKnobs[ i ]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); + m_vi->vstKnobs[ i ]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); sprintf( paramStr, "%d", i); - m_vi->knobFModel[i] = new FloatModel( (list1.at(2)).toFloat(), 0.0f, 1.0f, 0.01f, - _eff, tr( paramStr ) ); - connect( m_vi->knobFModel[i], SIGNAL( dataChanged() ), this, SLOT( setParameter() ) ); - m_vi->vstKnobs[i] ->setModel( m_vi->knobFModel[i] ); + m_vi->knobFModel[ i ] = new FloatModel( ( s_dumpValues.at( 2 ) ).toFloat(), + 0.0f, 1.0f, 0.01f, _eff, tr( paramStr ) ); + connect( m_vi->knobFModel[ i ], SIGNAL( dataChanged() ), this, + SLOT( setParameter() ) ); + m_vi->vstKnobs[ i ] ->setModel( m_vi->knobFModel[ i ] ); } }