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

Merge pull request #600 from softrabbit/master

Browse Source 
Organic: make mixing of oscillators independent of lower oscs
This commit is contained in:
Vesa V
2014-04-13 18:50:46 +03:00
parent 1f661be72c 4b1952d90c
commit 3a8f68d259
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/organic/organic.cpp
View File

@@ -75,7 +75,7 @@ QPixmap * organicInstrumentView::s_artwork = NULL;
organicInstrument::organicInstrument( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &organic_plugin_descriptor ),
m_modulationAlgo( Oscillator::SignalMix ),
m_modulationAlgo( Oscillator::SignalMix, Oscillator::SignalMix, Oscillator::SignalMix),
m_fx1Model( 0.0f, 0.0f, 0.99f, 0.01f , this, tr( "Distortion" ) ),
m_volModel( 100.0f, 0.0f, 200.0f, 1.0f, this, tr( "Volume" ) )
{
@@ -117,8 +117,7 @@ organicInstrument::organicInstrument( InstrumentTrack * _instrument_track ) :
connect( engine::mixer(), SIGNAL( sampleRateChanged() ),
this, SLOT( updateAllDetuning() ) );
this, SLOT( updateAllDetuning() ) );
}