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

Song: removed old action array

Browse Source 
As of commit c60e7ba8d1 we no longer queue
playback actions and process them later, therefore remove old remains.
This commit is contained in:
Tobias Doerffel
2014-02-03 20:11:18 +01:00
parent fd971ee3a2
commit e23d5838e7
2 changed files with 0 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/song.h
View File

@@ -354,18 +354,6 @@ private:
tick_t m_elapsedTicks;
tact_t m_elapsedTacts;
enum Actions
{
ActionStop,
ActionPlaySong,
ActionPlayTrack,
ActionPlayBB,
ActionPlayPattern,
ActionPause,
ActionResumeFromPause
} ;
QVector<Actions> m_actions;
VstSyncController m_vstSyncController;

112
src/core/song.cpp
View File

@@ -179,118 +179,6 @@ void song::savePos()
{
timeLine * tl = m_playPos[m_playMode].m_timeLine;
while( !m_actions.empty() )
{
switch( m_actions.front() )
{
case ActionStop:
{
m_playing = false;
m_vstSyncController.setPlaybackState( m_exporting );
m_recording = true;
if( tl != NULL )
{
switch( tl->behaviourAtStop() )
{
case timeLine::BackToZero:
m_playPos[m_playMode].setTicks( 0 );
m_elapsedMilliSeconds = 0;
break;
case timeLine::BackToStart:
if( tl->savedPos() >= 0 )
{
m_playPos[m_playMode].setTicks(
tl->savedPos().getTicks() );
m_elapsedMilliSeconds = (((tl->savedPos().getTicks())*60*1000/48)/getTempo());
tl->savePos( -1 );
}
break;
case timeLine::KeepStopPosition:
default:
break;
}
}
else
{
m_playPos[m_playMode].setTicks( 0 );
m_elapsedMilliSeconds = 0;
}
m_playPos[m_playMode].setCurrentFrame( 0 );
// remove all note-play-handles that are active
engine::mixer()->clear();
break;
}
case ActionPlaySong:
m_playMode = Mode_PlaySong;
m_playing = true;
m_vstSyncController.setPlaybackState( true );
Controller::resetFrameCounter();
break;
case ActionPlayTrack:
m_playMode = Mode_PlayTrack;
m_playing = true;
m_vstSyncController.setPlaybackState( true );
break;
case ActionPlayBB:
m_playMode = Mode_PlayBB;
m_playing = true;
m_vstSyncController.setPlaybackState( true );
break;
case ActionPlayPattern:
m_playMode = Mode_PlayPattern;
m_playing = true;
m_vstSyncController.setPlaybackState( true );
break;
case ActionPause:
m_playing = false;// just set the play-flag
m_vstSyncController.setPlaybackState( m_exporting );
m_paused = true;
break;
case ActionResumeFromPause:
m_playing = true;// just set the play-flag
m_vstSyncController.setPlaybackState( true );
m_paused = false;
break;
}
// a second switch for saving pos when starting to play
// anything (need pos for restoring it later in certain
// timeline-modes)
switch( m_actions.front() )
{
case ActionPlaySong:
case ActionPlayTrack:
case ActionPlayBB:
case ActionPlayPattern:
{
if( tl != NULL )
{
tl->savePos( m_playPos[m_playMode] );
}
break;
}
// keep GCC happy...
default:
break;
}
m_actions.erase( m_actions.begin() );
}
if( tl != NULL )
{
tl->savePos( m_playPos[m_playMode] );