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

fixed looping when processing the audio buffer

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@399 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-09-17 20:22:41 +00:00
parent 4b60f28954
commit 26e1c3a5cf
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/song_editor.cpp
View File

@@ -961,9 +961,11 @@ void songEditor::processNextBuffer( void )
// check for looping-mode and act if neccessary
timeLine * tl = m_playPos[m_playMode].m_timeLine;
if( tl != NULL && m_exporting == FALSE && tl->loopPointsEnabled() &&
!( m_playMode == PLAY_PATTERN &&
m_patternToPlay->freezing() == TRUE ) )
bool check_loop = tl != NULL && m_exporting == FALSE &&
tl->loopPointsEnabled() &&
!( m_playMode == PLAY_PATTERN &&
m_patternToPlay->freezing() == TRUE );
if( check_loop )
{
if( m_playPos[m_playMode] < tl->loopBegin() ||
m_playPos[m_playMode] >= tl->loopEnd() )
@@ -972,8 +974,6 @@ void songEditor::processNextBuffer( void )
tl->loopBegin().getTact() );
m_playPos[m_playMode].setTact64th(
tl->loopBegin().getTact64th() );
// force reset of current-frame-var afterwards
m_playPos[m_playMode].setCurrentFrame( 0 );
}
}
@@ -1030,6 +1030,18 @@ void songEditor::processNextBuffer( void )
}
}
m_playPos[m_playMode].setTact64th( tact64th % 64 );
if( check_loop )
{
if( m_playPos[m_playMode] >= tl->loopEnd() )
{
m_playPos[m_playMode].setTact(
tl->loopBegin().getTact() );
m_playPos[m_playMode].setTact64th(
tl->loopBegin().getTact64th() );
}
}
current_frame = fmodf( current_frame,
frames_per_tact64th );
m_playPos[m_playMode].setCurrentFrame( current_frame );