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

sfxr: use instrumentTrack() instead of maintaining own variable

Browse Source 
No need to maintain instrument track on our own here. Furthermore minor
coding style improvements.
This commit is contained in:
Tobias Doerffel
2014-01-29 22:49:45 +01:00
parent b1b5c56d0f
commit b4c4b293a0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sfxr/sfxr.cpp
View File

@@ -321,7 +321,6 @@ bool SfxrSynth::isPlaying() const
sfxrInstrument::sfxrInstrument( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &sfxr_plugin_descriptor ),
m_instrumentTrack(_instrument_track),
m_attModel(0.0f, this),
m_holdModel(0.3f, this),
m_susModel(0.0f, this),
@@ -1062,10 +1061,10 @@ void sfxrInstrumentView::mutate()
void sfxrInstrumentView::previewSound()
{
sfxrInstrument * s = castModel<sfxrInstrument>();
InstrumentTrack * it = s->m_instrumentTrack;
sfxrInstrument* s = castModel<sfxrInstrument>();
InstrumentTrack* it = s->instrumentTrack();
it->silenceAllNotes();
it->processInEvent( MidiEvent( MidiNoteOn, 0, it->baseNoteModel()->value(), MidiMaxVelocity ), MidiTime() );
it->processInEvent( MidiEvent( MidiNoteOn, 0, it->baseNoteModel()->value(), MidiMaxVelocity ) );
}
@@ -1074,9 +1073,9 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model*, void* data )
{
return( new sfxrInstrument( static_cast<InstrumentTrack *>( _data ) ) );
return new sfxrInstrument( static_cast<InstrumentTrack *>( data ) );
}

1
plugins/sfxr/sfxr.h
View File

@@ -184,7 +184,6 @@ public:
private:
InstrumentTrack * m_instrumentTrack;
SfxrZeroToOneFloatModel m_attModel;
SfxrZeroToOneFloatModel m_holdModel;
SfxrZeroToOneFloatModel m_susModel;