From a4caab6fe7b6e6ca86d5920fa453cdb2a78031f5 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 27 Jul 2008 18:12:34 +0000 Subject: [PATCH] reverted previous change of some models from floatModel to intModel as it caused crashes in knob-class git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1384 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/instrument_track.h | 6 +++--- src/tracks/instrument_track.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/instrument_track.h b/include/instrument_track.h index e9cf2bcac..3922396b0 100644 --- a/include/instrument_track.h +++ b/include/instrument_track.h @@ -180,9 +180,9 @@ private: QList m_processHandles; - intModel m_volumeModel; - intModel m_panningModel; - intModel m_pitchModel; + floatModel m_volumeModel; + floatModel m_panningModel; + floatModel m_pitchModel; intModel m_effectChannelModel; diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 0ef8cc3f3..e023e6250 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -101,11 +101,11 @@ instrumentTrack::instrumentTrack( trackContainer * _tc ) : this, this ), m_notes(), m_baseNoteModel( 0, 0, KeysPerOctave * NumOctaves - 1, this ), - m_volumeModel( DefaultVolume, MinVolume, MaxVolume, this, + m_volumeModel( DefaultVolume, MinVolume, MaxVolume, 1, this, tr( "Volume" ) ), - m_panningModel( DefaultPanning, PanningLeft, PanningRight, + m_panningModel( DefaultPanning, PanningLeft, PanningRight, 1, this, tr( "Panning" ) ), - m_pitchModel( 0, -100, 100, this, tr( "Pitch" ) ), + m_pitchModel( 0, -100, 100, 1, this, tr( "Pitch" ) ), m_effectChannelModel( 0, 0, NumFxChannels, this, tr( "FX channel" ) ), m_instrument( NULL ), m_soundShaping( this ),