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

changed coding-style for enum-constants, use model for external wave-shape- and modulation-algo-parameter

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@673 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-01-26 00:43:06 +00:00
parent be604b1d68
commit 73be443b23
2 changed files with 165 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
include/oscillator.h
View File

@@ -1,7 +1,7 @@
/*
* oscillator.h - header-file for oscillator.cpp, a powerful oscillator-class
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -38,40 +38,49 @@
#include "sample_buffer.h"
#include "lmms_constants.h"
#include "lmms_math.h"
#include "automatable_model.h"
class oscillator
{
public:
enum waveShapes
enum WaveShapes
{
SIN_WAVE,
TRIANGLE_WAVE,
SAW_WAVE,
SQUARE_WAVE,
MOOG_SAW_WAVE,
EXP_WAVE,
WHITE_NOISE_WAVE,
USER_DEF_WAVE
SineWave,
TriangleWave,
SawWave,
SquareWave,
MoogSawWave,
ExponentialWave,
WhiteNoise,
UserDefinedWave,
NumWaveShapes
} ;
enum modulationAlgos
enum ModulationAlgos
{
PHASE_MODULATION, AMP_MODULATION, MIX, SYNC, FREQ_MODULATION
PhaseModulation,
AmplitudeModulation,
SignalMix,
SynchronizedBySubOsc,
FrequencyModulation,
NumModulationAlgos,
} ;
oscillator( const waveShapes & _wave_shape,
const modulationAlgos & _modulation_algo,
oscillator( const intModel & _wave_shape_model,
const intModel & _mod_algo_model,
const float & _freq,
const float & _detuning,
const float & _phase_offset,
const float & _volume,
oscillator * _m_subOsc = NULL ) FASTCALL;
oscillator * _m_subOsc = NULL );
virtual ~oscillator()
{
delete m_subOsc;
}
inline void setUserWave( const sampleBuffer * _wave )
{
m_userWave = _wave;
@@ -154,8 +163,8 @@ public:
private:
const waveShapes & m_waveShape;
const modulationAlgos & m_modulationAlgo;
const intModel & m_waveShapeModel;
const intModel & m_modulationAlgoModel;
const float & m_freq;
const float & m_detuning;
const float & m_volume;
@@ -183,26 +192,26 @@ private:
const ch_cnt_t _chnl );
inline bool syncOk( float _osc_coeff );
template<waveShapes W>
template<WaveShapes W>
void updateNoSub( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
void updatePM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
void updateAM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
void updateMix( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
void updateSync( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
void updateFM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl );
template<waveShapes W>
template<WaveShapes W>
inline sample_t getSample( const float _sample );
inline void FASTCALL recalcPhase( void );