hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2104 from Wallacoloo/init_m_fb

Browse Source 
Properly initialize InstrumentTrack::m_fb
This commit is contained in:
Lukas W
2015-06-15 10:30:52 +02:00
parent 44f8b24fb3 eaf6ad35d8
commit 61a9e9de02
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tracks/InstrumentTrack.cpp
View File

@@ -116,6 +116,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) :
m_pitchRangeModel( 1, 1, 24, this, tr( "Pitch range" ) ),
m_effectChannelModel( 0, 0, 0, this, tr( "FX channel" ) ),
m_useMasterPitchModel( true, this, tr( "Master Pitch") ),
m_fb( NULL ),
m_instrument( NULL ),
m_soundShaping( this ),
m_arpeggio( this ),
@@ -126,10 +127,6 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) :
m_panningModel.setCenterValue( DefaultPanning );
m_baseNoteModel.setInitValue( DefaultKey );
connect( &m_baseNoteModel, SIGNAL( dataChanged() ), this, SLOT( updateBaseNote() ) );
connect( &m_pitchModel, SIGNAL( dataChanged() ), this, SLOT( updatePitch() ) );
connect( &m_pitchRangeModel, SIGNAL( dataChanged() ), this, SLOT( updatePitchRange() ) );
m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1);
for( int i = 0; i < NumKeys; ++i )
@@ -141,6 +138,9 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) :
setName( tr( "Default preset" ) );
connect( &m_baseNoteModel, SIGNAL( dataChanged() ), this, SLOT( updateBaseNote() ) );
connect( &m_pitchModel, SIGNAL( dataChanged() ), this, SLOT( updatePitch() ) );
connect( &m_pitchRangeModel, SIGNAL( dataChanged() ), this, SLOT( updatePitchRange() ) );
}