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

bugfixes and more

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@139 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2006-05-29 13:08:08 +00:00
parent 260e8cf59f
commit 60e2442405
11 changed files with 3297 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/oscillator.h
View File

@@ -35,8 +35,9 @@
#endif
#include "mixer.h"
#include "interpolation.h"
#include "sample_buffer.h"
#include "lmms_constants.h"
#include "volume_knob.h"
// fwd-decl because we need it for the typedef below...
@@ -47,9 +48,6 @@ typedef void ( oscillator:: * oscFuncPtr )
const ch_cnt_t _chnl );
const sampleFrame ZERO_FRAME = { 0.0f, 0.0f } ;
class oscillator
{
public:
@@ -72,6 +70,7 @@ public:
oscillator( const modulationAlgos _modulation_algo, const float _freq,
const Sint16 _phase_offset, const float _volume_factor,
const volumeKnob * _volume_knob,
const sample_rate_t _sample_rate,
oscillator * _m_subOsc ) FASTCALL;
virtual ~oscillator()
@@ -79,19 +78,9 @@ public:
delete m_subOsc;
}
inline void setUserWave( const sampleFrame * _data,
const f_cnt_t _frames )
inline void setUserWave( sampleBuffer * _wave )
{
if( m_userWaveFrames > 0 )
{
m_userWaveData = _data;
m_userWaveFrames = _frames;
}
else
{
m_userWaveData = &ZERO_FRAME;
m_userWaveFrames = 1;
}
m_userWave = _wave;
}
inline void update( sampleFrame * _ab, const fpab_t _frames,
@@ -114,6 +103,7 @@ public:
const float _freq,
const Sint16 _phase_offset,
const float _volume_factor,
const volumeKnob * _volume_knob,
const sample_rate_t _sample_rate,
oscillator * _m_subOsc = NULL );
inline bool syncOk( void )
@@ -192,38 +182,34 @@ public:
RAND_MAX ) ) );
}
static inline sample_t userWaveSample( const float _sample,
const sampleFrame * _user_wave,
const f_cnt_t _user_wave_frames )
{
const float frame = fraction( fabs( _sample ) ) * _user_wave_frames;
const f_cnt_t f1 = static_cast<f_cnt_t>( frame );
const f_cnt_t f2 = ( f1 + 1 ) % _user_wave_frames;
return( linearInterpolate( _user_wave[f1][0],
_user_wave[f2][0],
fraction( frame ) ) );
}
inline sample_t userWaveSample( const float _sample )
{
return( userWaveSample( _sample, m_userWaveData,
m_userWaveFrames ) );
if( m_userWave->frames() > 0 )
{
return( m_userWave->userWaveSample( _sample ) );
}
else
{
return( 0.0f );
}
}
protected:
float m_freq;
float m_volumeFactor;
const volumeKnob * m_volumeKnob;
Sint16 m_phaseOffset;
const sample_rate_t m_sampleRate;
oscillator * m_subOsc;
f_cnt_t m_sample;
float m_oscCoeff;
sampleFrame const * m_userWaveData;
f_cnt_t m_userWaveFrames;
sampleBuffer * m_userWave;
oscFuncPtr m_callUpdate;
float volumeFactor( void );
virtual void FASTCALL updateNoSub( sampleFrame * _ab,
const fpab_t _frames,
const ch_cnt_t _chnl ) = 0;

19
include/sample_buffer.h
View File

@@ -51,6 +51,7 @@
#include "mixer.h"
#include "interpolation.h"
#include "types.h"
@@ -149,6 +150,24 @@ public:
_dst_sr, _buf->eng() ) );
}
static inline float fraction( const float _sample )
{
return( _sample - static_cast<int>( _sample ) );
}
inline sample_t userWaveSample( const float _sample )
{
m_dataMutex.lock();
const float frame = fraction( fabs( _sample ) ) * m_frames;
const f_cnt_t f1 = static_cast<f_cnt_t>( frame );
const f_cnt_t f2 = ( f1 + 1 ) % m_frames;
sample_t waveSample = linearInterpolate( m_data[f1][0],
m_data[f2][0],
fraction( frame ) );
m_dataMutex.unlock();
return( waveSample );
}
public slots:
void setAudioFile( const QString & _audio_file );