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

Merge pull request #2458 from softrabbit/issue1499

Browse Source 
Organic: make oscillator phase offsets per-note
This commit is contained in:
Raine M. Ekman
2016-05-20 21:10:34 +03:00
parent 2810c9905c ca0c278655
commit 673cf27e90
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/organic/organic.cpp
View File

@@ -81,7 +81,7 @@ organicInstrument::organicInstrument( InstrumentTrack * _instrument_track ) :
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" ) )
{
m_numOscillators = 8;
m_numOscillators = NUM_OSCILLATORS;
m_osc = new OscillatorObject*[ m_numOscillators ];
for (int i=0; i < m_numOscillators; i++)
@@ -235,15 +235,14 @@ void organicInstrument::playNote( NotePlayHandle * _n,
Oscillator * oscs_l[m_numOscillators];
Oscillator * oscs_r[m_numOscillators];
_n->m_pluginData = new oscPtr;
for( int i = m_numOscillators - 1; i >= 0; --i )
{
m_osc[i]->m_phaseOffsetLeft = rand()
/ ( RAND_MAX + 1.0f );
m_osc[i]->m_phaseOffsetRight = rand()
/ ( RAND_MAX + 1.0f );
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i]
= rand() / ( RAND_MAX + 1.0f );
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i]
= rand() / ( RAND_MAX + 1.0f );
// initialise ocillators
@@ -255,7 +254,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i],
m_osc[i]->m_volumeLeft );
// create right oscillator
oscs_r[i] = new Oscillator(
@@ -263,7 +262,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i],
m_osc[i]->m_volumeRight );
}
else
@@ -274,7 +273,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i],
m_osc[i]->m_volumeLeft,
oscs_l[i + 1] );
// create right oscillator
@@ -283,7 +282,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i],
m_osc[i]->m_volumeRight,
oscs_r[i + 1] );
}
@@ -291,7 +290,6 @@ void organicInstrument::playNote( NotePlayHandle * _n,
}
_n->m_pluginData = new oscPtr;
static_cast<oscPtr *>( _n->m_pluginData )->oscLeft = oscs_l[0];
static_cast<oscPtr *>( _n->m_pluginData )->oscRight = oscs_r[0];
}
@@ -330,6 +328,7 @@ void organicInstrument::deleteNotePluginData( NotePlayHandle * _n )
_n->m_pluginData )->oscLeft );
delete static_cast<Oscillator *>( static_cast<oscPtr *>(
_n->m_pluginData )->oscRight );
delete static_cast<oscPtr *>( _n->m_pluginData );
}

3
plugins/organic/organic.h
View File

@@ -39,6 +39,7 @@ class Knob;
class NotePlayHandle;
class PixmapButton;
const int NUM_OSCILLATORS = 8;
const int NUM_HARMONICS = 18;
const QString HARMONIC_NAMES[NUM_HARMONICS] = {
"Octave below",
@@ -153,6 +154,8 @@ private:
MM_OPERATORS
Oscillator * oscLeft;
Oscillator * oscRight;
float phaseOffsetLeft[NUM_OSCILLATORS];
float phaseOffsetRight[NUM_OSCILLATORS];
} ;
const IntModel m_modulationAlgo;