From b4e78065e7fe043b2e423f81340d2b3b5fbc7e5a Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Wed, 14 Mar 2018 14:48:18 +0900 Subject: [PATCH] Fix some bugs with LFO waveform drag&drop (#4227) * Change to user-wave mode and update display after dropping a sample * Fix broken drag&drop from sample tracks --- src/gui/widgets/EnvelopeAndLfoView.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 4d61e814c..4131a956e 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -393,14 +393,20 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de ) m_params->m_userWave.setAudioFile( StringPairDrag::decodeValue( _de ) ); m_userLfoBtn->model()->setValue( true ); + m_params->m_lfoWaveModel.setValue(EnvelopeAndLfoParameters::UserDefinedWave); _de->accept(); + update(); } else if( type == QString( "tco_%1" ).arg( Track::SampleTrack ) ) { DataFile dataFile( value.toUtf8() ); - m_params->m_userWave.setAudioFile( dataFile.content().firstChild().toElement(). attribute( "src" ) ); + m_params->m_userWave.setAudioFile( dataFile.content(). + firstChildElement().firstChildElement(). + firstChildElement().attribute( "src" ) ); m_userLfoBtn->model()->setValue( true ); + m_params->m_lfoWaveModel.setValue(EnvelopeAndLfoParameters::UserDefinedWave); _de->accept(); + update(); } }