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

less header-dependencies and moved some type-definitions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/oscillator.cpp
View File

@@ -26,11 +26,14 @@
#include "oscillator.h"
#include "engine.h"
#include "mixer.h"
#include "automatable_model.h"
oscillator::oscillator( const intModel & _wave_shape_model,
const intModel & _mod_algo_model,
oscillator::oscillator( const intModel * _wave_shape_model,
const intModel * _mod_algo_model,
const float & _freq,
const float & _detuning,
const float & _phase_offset,
@@ -62,7 +65,7 @@ void oscillator::update( sampleFrame * _ab, const fpp_t _frames,
}
if( m_subOsc != NULL )
{
switch( m_modulationAlgoModel.value() )
switch( m_modulationAlgoModel->value() )
{
case PhaseModulation:
updatePM( _ab, _frames, _chnl );
@@ -92,7 +95,7 @@ void oscillator::update( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updateNoSub( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:
@@ -128,7 +131,7 @@ void oscillator::updateNoSub( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updatePM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:
@@ -164,7 +167,7 @@ void oscillator::updatePM( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updateAM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:
@@ -200,7 +203,7 @@ void oscillator::updateAM( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updateMix( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:
@@ -236,7 +239,7 @@ void oscillator::updateMix( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updateSync( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:
@@ -272,7 +275,7 @@ void oscillator::updateSync( sampleFrame * _ab, const fpp_t _frames,
void oscillator::updateFM( sampleFrame * _ab, const fpp_t _frames,
const ch_cnt_t _chnl )
{
switch( m_waveShapeModel.value() )
switch( m_waveShapeModel->value() )
{
case SineWave:
default:

1
src/core/sample_buffer.cpp
View File

@@ -26,6 +26,7 @@
#include "sample_buffer.h"
#include "mixer.h"
#include <QtCore/QBuffer>

3
src/core/sample_play_handle.cpp
View File

@@ -132,7 +132,8 @@ void samplePlayHandle::play( bool /* _try_parallelizing */,
stereoVolumeVector v =
{ { m_volumeModel->value() / DefaultVolume,
m_volumeModel->value() / DefaultVolume } };
m_sampleBuffer->play( _working_buffer, &m_state, frames );
m_sampleBuffer->play( _working_buffer, &m_state, frames,
BaseFreq );
engine::getMixer()->bufferToPort( _working_buffer, frames,
offset(), v, m_audioPort );
}