Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Song::processNextBuffer() - add more comments and rename variables #1884

Merged
merged 2 commits into from
Apr 17, 2015
Merged

Song::processNextBuffer() - add more comments and rename variables #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d308a72
Song::processNextBuffer() - add more comments and rename variables wi…
M374LX Mar 19, 2015
bf13859
Remove unused variable
M374LX Mar 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include/Song.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ class EXPORT Song : public TrackContainer
PlayPos( const int abs = 0 ) :
MidiTime( abs ),
m_timeLine( NULL ),
m_timeLineUpdate( true ),
m_currentFrame( 0.0f )
{
}
Expand All @@ -88,7 +87,6 @@ class EXPORT Song : public TrackContainer
return m_currentFrame;
}
TimeLineWidget * m_timeLine;
bool m_timeLineUpdate;

private:
float m_currentFrame;
Expand Down
53 changes: 31 additions & 22 deletions src/core/Song.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,17 @@ void Song::savePos()

void Song::processNextBuffer()
{
// if not playing, nothing to do
if( m_playing == false )
{
return;
}

TrackList trackList;
int tcoNum = -1;
int tcoNum = -1; // track content object number

// determine the list of tracks to play and the track content object
// (TCO) number
switch( m_playMode )
{
case Mode_PlaySong:
Expand Down Expand Up @@ -247,6 +250,7 @@ void Song::processNextBuffer()

}

// if we have no tracks to play, nothing to do
if( trackList.empty() == true )
{
return;
Expand All @@ -259,6 +263,8 @@ void Song::processNextBuffer()

if( checkLoop )
{
// if looping-mode is enabled and we are outside of the looping
// range, go to the beginning of the range
if( m_playPos[m_playMode] < tl->loopBegin() ||
m_playPos[m_playMode] >= tl->loopEnd() )
{
Expand All @@ -269,16 +275,13 @@ void Song::processNextBuffer()
}
}

f_cnt_t totalFramesPlayed = 0;
f_cnt_t framesPlayed = 0;
const float framesPerTick = Engine::framesPerTick();

while( totalFramesPlayed < Engine::mixer()->framesPerPeriod() )
while( framesPlayed < Engine::mixer()->framesPerPeriod() )
{
m_vstSyncController.update();

f_cnt_t playedFrames = Engine::mixer()->framesPerPeriod() -
totalFramesPlayed;

float currentFrame = m_playPos[m_playMode].currentFrame();
// did we play a tick?
if( currentFrame >= framesPerTick )
Expand Down Expand Up @@ -335,6 +338,9 @@ void Song::processNextBuffer()
m_vstSyncController.startCycle(
tl->loopBegin().getTicks(), tl->loopEnd().getTicks() );

// if looping-mode is enabled and we have got
// past the looping range, return to the
// beginning of the range
if( m_playPos[m_playMode] >= tl->loopEnd() )
{
m_playPos[m_playMode].setTicks( tl->loopBegin().getTicks() );
Expand All @@ -353,23 +359,26 @@ void Song::processNextBuffer()
m_playPos[m_playMode].setCurrentFrame( currentFrame );
}

f_cnt_t lastFrames = ( f_cnt_t )framesPerTick -
( f_cnt_t )currentFrame;
f_cnt_t framesToPlay =
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

framesToPlay is the old playedFrames, now closer to where it is first used

Engine::mixer()->framesPerPeriod() - framesPlayed;

f_cnt_t framesLeft = ( f_cnt_t )framesPerTick -
( f_cnt_t )currentFrame;
// skip last frame fraction
if( lastFrames == 0 )
if( framesLeft == 0 )
{
++totalFramesPlayed;
++framesPlayed;
m_playPos[m_playMode].setCurrentFrame( currentFrame
+ 1.0f );
continue;
}
// do we have some samples left in this tick but these are
// less then samples we have to play?
if( lastFrames < playedFrames )
// do we have samples left in this tick but these are less
// than samples we have to play?
if( framesLeft < framesToPlay )
{
// then set played_samples to remaining samples, the
// then set framesToPlay to remaining samples, the
// rest will be played in next loop
playedFrames = lastFrames;
framesToPlay = framesLeft;
}

if( ( f_cnt_t ) currentFrame == 0 )
Expand All @@ -378,25 +387,25 @@ void Song::processNextBuffer()
{
m_globalAutomationTrack->play(
m_playPos[m_playMode],
playedFrames,
totalFramesPlayed, tcoNum );
framesToPlay,
framesPlayed, tcoNum );
}

// loop through all tracks and play them
for( int i = 0; i < trackList.size(); ++i )
{
trackList[i]->play( m_playPos[m_playMode],
playedFrames,
totalFramesPlayed, tcoNum );
framesToPlay,
framesPlayed, tcoNum );
}
}

// update frame-counters
totalFramesPlayed += playedFrames;
m_playPos[m_playMode].setCurrentFrame( playedFrames +
framesPlayed += framesToPlay;
m_playPos[m_playMode].setCurrentFrame( framesToPlay +
currentFrame );
m_elapsedMilliSeconds +=
( ( playedFrames / framesPerTick ) * 60 * 1000 / 48 )
( ( framesToPlay / framesPerTick ) * 60 * 1000 / 48 )
/ getTempo();
m_elapsedTacts = m_playPos[Mode_PlaySong].getTact();
m_elapsedTicks = ( m_playPos[Mode_PlaySong].getTicks() % ticksPerTact() ) / 48;
Expand Down