From d9c2be73fa808cdd51697f12691624fd57e02449 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Mon, 27 Apr 2015 06:24:47 +0000 Subject: [PATCH 1/2] Remove unused function Song::playTrack --- include/Song.h | 1 - src/core/Song.cpp | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/include/Song.h b/include/Song.h index 6b7bb2439..793416011 100644 --- a/include/Song.h +++ b/include/Song.h @@ -256,7 +256,6 @@ public slots: void playSong(); void record(); void playAndRecord(); - void playTrack( Track * trackToPlay ); void playBB(); void playPattern( const Pattern * patternToPlay, bool loop = true ); void togglePause(); diff --git a/src/core/Song.cpp b/src/core/Song.cpp index 9e808252d..e058efa22 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -479,28 +479,6 @@ void Song::playAndRecord() -void Song::playTrack( Track * trackToPlay ) -{ - if( isStopped() == false ) - { - stop(); - } - m_trackToPlay = trackToPlay; - - m_playMode = Mode_PlayTrack; - m_playing = true; - m_paused = false; - - m_vstSyncController.setPlaybackState( true ); - - savePos(); - - emit playbackStateChanged(); -} - - - - void Song::playBB() { if( isStopped() == false ) From 57cdfe1b6642c08baa2ca7fe3742cd1aeb9fd7b2 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Mon, 27 Apr 2015 06:33:22 +0000 Subject: [PATCH 2/2] Remove unused Mode_PlayTrack and m_trackToPlay --- include/Song.h | 2 -- src/core/Song.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/include/Song.h b/include/Song.h index 793416011..3f52cbbb1 100644 --- a/include/Song.h +++ b/include/Song.h @@ -57,7 +57,6 @@ public: { Mode_None, Mode_PlaySong, - Mode_PlayTrack, Mode_PlayBB, Mode_PlayPattern, Mode_PlayAutomationPattern, @@ -352,7 +351,6 @@ private: PlayPos m_playPos[Mode_Count]; tact_t m_length; - Track * m_trackToPlay; const Pattern* m_patternToPlay; bool m_loopPattern; diff --git a/src/core/Song.cpp b/src/core/Song.cpp index e058efa22..b336aec82 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -94,7 +94,6 @@ Song::Song() : m_errors( new QList() ), m_playMode( Mode_None ), m_length( 0 ), - m_trackToPlay( NULL ), m_patternToPlay( NULL ), m_loopPattern( false ), m_elapsedMilliSeconds( 0 ), @@ -221,10 +220,6 @@ void Song::processNextBuffer() } break; - case Mode_PlayTrack: - trackList.push_back( m_trackToPlay ); - break; - case Mode_PlayBB: if( Engine::getBBTrackContainer()->numOfBBs() > 0 ) {