mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-19 06:28:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

process FX-channels until effects signal that there's nothing more to process - closes #1935872

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@899 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-04-07 22:55:08 +00:00
parent bd6ff6d9bb
commit e2e34b6ffa
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2008-04-07 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/fx_mixer.cpp:
process FX-channels until effects signal that there's nothing more to
process - closes #1935872
* configure.in:
integrated changes from libsamplerate-0.1.3/configure.ac

9
src/core/fx_mixer.cpp
View File

@@ -48,6 +48,7 @@ struct fxChannel
fxChannel( model * _parent ) :
m_fxChain( NULL ),
m_used( FALSE ),
m_stillRunning( FALSE ),
m_peakLeft( 0.0f ),
m_peakRight( 0.0f ),
m_buffer( new sampleFrame[
@@ -68,6 +69,7 @@ struct fxChannel
effectChain m_fxChain;
bool m_used;
bool m_stillRunning;
float m_peakLeft;
float m_peakRight;
sampleFrame * m_buffer;
@@ -124,11 +126,13 @@ void fxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch )
void fxMixer::processChannel( fx_ch_t _ch )
{
if( m_fxChannels[_ch]->m_used || _ch == 0 )
if( m_fxChannels[_ch]->m_used || m_fxChannels[_ch]->m_stillRunning ||
_ch == 0 )
{
const fpp_t f = engine::getMixer()->framesPerPeriod();
m_fxChannels[_ch]->m_fxChain.startRunning();
m_fxChannels[_ch]->m_fxChain.processAudioBuffer(
m_fxChannels[_ch]->m_stillRunning =
m_fxChannels[_ch]->m_fxChain.processAudioBuffer(
m_fxChannels[_ch]->m_buffer, f );
m_fxChannels[_ch]->m_peakLeft =
engine::getMixer()->peakValueLeft(
@@ -138,6 +142,7 @@ void fxMixer::processChannel( fx_ch_t _ch )
engine::getMixer()->peakValueRight(
m_fxChannels[_ch]->m_buffer, f ) *
m_fxChannels[_ch]->m_volumeModel.value();
m_fxChannels[_ch]->m_used = TRUE;
}
else
{