From 93e247faf0d09ac4cf9c9b54d6d39f1852926ee2 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 25 Feb 2008 14:09:23 +0000 Subject: [PATCH] fixed wrong index for saving/restoring modulation-algo-settings - now projects sound like they did in pre-MV git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@707 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 4 ++++ plugins/triple_oscillator/triple_oscillator.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0995155d1..7e5414b51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-02-25 Tobias Doerffel + * plugins/triple_oscillator/triple_oscillator.cpp: + fixed wrong index for saving/restoring modulation-algo-settings - + now projects sound like they did in pre-MV + * include/automation_editor.h: * include/combobox.h: * src/core/song.cpp: diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index c5e408c96..0cd0a1bc0 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -261,7 +261,7 @@ void tripleOscillator::saveSettings( QDomDocument & _doc, QDomElement & _this ) m_osc[i]->m_waveShapeModel.saveSettings( _doc, _this, "wavetype" + is ); m_osc[i]->m_modulationAlgoModel.saveSettings( _doc, _this, - "modalgo" + is ); + "modalgo" + QString( i+1 ) ); _this.setAttribute( "userwavefile" + is, m_osc[i]->m_sampleBuffer->audioFile() ); } @@ -274,7 +274,7 @@ void tripleOscillator::loadSettings( const QDomElement & _this ) { for( int i = 0; i < NUM_OF_OSCILLATORS; ++i ) { - QString is = QString::number( i ); + const QString is = QString::number( i ); m_osc[i]->m_volumeModel.loadSettings( _this, "vol" + is ); m_osc[i]->m_panModel.loadSettings( _this, "pan" + is ); m_osc[i]->m_coarseModel.loadSettings( _this, "coarse" + is ); @@ -287,7 +287,7 @@ void tripleOscillator::loadSettings( const QDomElement & _this ) m_osc[i]->m_waveShapeModel.loadSettings( _this, "wavetype" + is ); m_osc[i]->m_modulationAlgoModel.loadSettings( _this, - "modalgo" + is ); + "modalgo" + QString::number( i+1 ) ); m_osc[i]->m_sampleBuffer->setAudioFile( _this.attribute( "userwavefile" + is ) ); }