less header-dependencies and moved some type-definitions

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1372 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-25 11:16:45 +00:00
parent fe55d0cdcc
commit 30756e7399
12 changed files with 78 additions and 50 deletions

View File

@@ -206,16 +206,16 @@ void organicInstrument::playNote( notePlayHandle * _n, bool,
{
// create left oscillator
oscs_l[i] = new oscillator(
m_osc[i]->m_waveShape,
m_modulationAlgo,
&m_osc[i]->m_waveShape,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
m_osc[i]->m_volumeLeft );
// create right oscillator
oscs_r[i] = new oscillator(
m_osc[i]->m_waveShape,
m_modulationAlgo,
&m_osc[i]->m_waveShape,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
@@ -225,8 +225,8 @@ void organicInstrument::playNote( notePlayHandle * _n, bool,
{
// create left oscillator
oscs_l[i] = new oscillator(
m_osc[i]->m_waveShape,
m_modulationAlgo,
&m_osc[i]->m_waveShape,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
@@ -234,8 +234,8 @@ void organicInstrument::playNote( notePlayHandle * _n, bool,
oscs_l[i + 1] );
// create right oscillator
oscs_r[i] = new oscillator(
m_osc[i]->m_waveShape,
m_modulationAlgo,
&m_osc[i]->m_waveShape,
&m_modulationAlgo,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,

View File

@@ -326,15 +326,15 @@ void tripleOscillator::playNote( notePlayHandle * _n, bool,
if( i == NUM_OF_OSCILLATORS - 1 )
{
oscs_l[i] = new oscillator(
m_osc[i]->m_waveShapeModel,
m_osc[i]->m_modulationAlgoModel,
&m_osc[i]->m_waveShapeModel,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
m_osc[i]->m_volumeLeft );
oscs_r[i] = new oscillator(
m_osc[i]->m_waveShapeModel,
m_osc[i]->m_modulationAlgoModel,
&m_osc[i]->m_waveShapeModel,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
@@ -343,16 +343,16 @@ void tripleOscillator::playNote( notePlayHandle * _n, bool,
else
{
oscs_l[i] = new oscillator(
m_osc[i]->m_waveShapeModel,
m_osc[i]->m_modulationAlgoModel,
&m_osc[i]->m_waveShapeModel,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
m_osc[i]->m_volumeLeft,
oscs_l[i + 1] );
oscs_r[i] = new oscillator(
m_osc[i]->m_waveShapeModel,
m_osc[i]->m_modulationAlgoModel,
&m_osc[i]->m_waveShapeModel,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,