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

- made mixer::buffertToPort accept a stereoVolumeVector as audio-buffers

Browse Source 
have stereo-audio-buffers now
- made peakValueLeft() and peakValueRight() take a sampleFrame-pointer
- process in stereo internally



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@874 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-04-03 20:27:23 +00:00
parent f1a2d8bce7
commit 753c5b86a3
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/mixer.h
View File

@@ -73,11 +73,6 @@ const sample_rate_t DEFAULT_SAMPLE_RATE = 44100;
typedef sample_t sampleFrame[DEFAULT_CHANNELS];
typedef sample_t surroundSampleFrame[SURROUND_CHANNELS];
typedef struct
{
float vol[SURROUND_CHANNELS];
} volumeVector;
const Uint8 BYTES_PER_SAMPLE = sizeof( sample_t );
const Uint8 BYTES_PER_INT_SAMPLE = sizeof( int_sample_t );
@@ -274,8 +269,8 @@ public:
void FASTCALL bufferToPort( const sampleFrame * _buf,
const fpp_t _frames,
const f_cnt_t _offset,
const volumeVector & _volumeVector,
audioPort * _port );
stereoVolumeVector _volume_vector,
audioPort * _port );
void FASTCALL clearAudioBuffer( sampleFrame * _ab,
const f_cnt_t _frames,
@@ -286,10 +281,8 @@ public:
const f_cnt_t _offset = 0 );
#endif
static float peakValueLeft( surroundSampleFrame * _ab,
const f_cnt_t _frames );
static float peakValueRight( surroundSampleFrame * _ab,
const f_cnt_t _frames );
static float peakValueLeft( sampleFrame * _ab, const f_cnt_t _frames );
static float peakValueRight( sampleFrame * _ab, const f_cnt_t _frames );
bool criticalXRuns( void ) const;

21
src/core/mixer.cpp
View File

@@ -33,6 +33,7 @@
#include "mixer.h"
#include "fx_mixer.h"
#include "play_handle.h"
#include "effect.h"
#include "song.h"
#include "templates.h"
#include "envelope_and_lfo_parameters.h"
@@ -622,7 +623,7 @@ void mixer::clear( void )
void FASTCALL mixer::bufferToPort( const sampleFrame * _buf,
const fpp_t _frames,
const f_cnt_t _offset,
const volumeVector & _volume_vector,
stereoVolumeVector _vv,
audioPort * _port )
{
const fpp_t start_frame = _offset % m_framesPerPeriod;
@@ -632,12 +633,11 @@ void FASTCALL mixer::bufferToPort( const sampleFrame * _buf,
_port->lockFirstBuffer();
for( fpp_t frame = start_frame; frame < loop1_frame; ++frame )
{
for( ch_cnt_t chnl = 0; chnl < m_audioDev->channels(); ++chnl )
for( ch_cnt_t chnl = 0; chnl < DEFAULT_CHANNELS; ++chnl )
{
_port->firstBuffer()[frame][chnl] +=
_buf[frame - start_frame][chnl %
DEFAULT_CHANNELS] *
_volume_vector.vol[chnl];
_buf[frame - start_frame][chnl] *
_vv.vol[chnl];
}
}
_port->unlockFirstBuffer();
@@ -650,13 +650,12 @@ void FASTCALL mixer::bufferToPort( const sampleFrame * _buf,
m_framesPerPeriod );
for( fpp_t frame = 0; frame < end_frame; ++frame )
{
for( ch_cnt_t chnl = 0; chnl < m_audioDev->channels();
for( ch_cnt_t chnl = 0; chnl < DEFAULT_CHANNELS;
++chnl )
{
_port->secondBuffer()[frame][chnl] +=
_buf[frames_done + frame][chnl %
DEFAULT_CHANNELS] *
_volume_vector.vol[chnl];
_buf[frames_done + frame][chnl] *
_vv.vol[chnl];
}
}
// we used both buffers so set flags
@@ -694,7 +693,7 @@ void FASTCALL mixer::clearAudioBuffer( surroundSampleFrame * _ab,
float mixer::peakValueLeft( surroundSampleFrame * _ab, const f_cnt_t _frames )
float mixer::peakValueLeft( sampleFrame * _ab, const f_cnt_t _frames )
{
float p = 0.0f;
for( f_cnt_t f = 0; f < _frames; ++f )
@@ -714,7 +713,7 @@ float mixer::peakValueLeft( surroundSampleFrame * _ab, const f_cnt_t _frames )
float mixer::peakValueRight( surroundSampleFrame * _ab, const f_cnt_t _frames )
float mixer::peakValueRight( sampleFrame * _ab, const f_cnt_t _frames )
{
float p = 0.0f;
for( f_cnt_t f = 0; f < _frames; ++f )