From dc37ef9e065594ecb5bd1f4feb2ec354fca2b7db Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Sun, 5 Feb 2017 19:01:24 -0500 Subject: [PATCH] remove launch scan code I wasn't sure if I wanted. --- src/GroovePlayer.cpp | 21 ++++----------------- src/GroovePlayer.h | 1 - 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/GroovePlayer.cpp b/src/GroovePlayer.cpp index 240529e..d0cbb45 100644 --- a/src/GroovePlayer.cpp +++ b/src/GroovePlayer.cpp @@ -46,22 +46,10 @@ GroovePlayerMgr::GroovePlayerMgr (std::string dbFile) : sqliteConnection(dbFile) } groove_init(); - /*bool emptyTrackListing = false; - { - Wt::Dbo::Transaction transaction(sqlSession); - int trackCount = sqlSession.query("select count(fingerprint) from tracks"); - emptyTrackListing = trackCount==0; - } - if(emptyTrackListing) - { - grooveAudioScanner = new std::thread([this](){grooveAudioScannerLoop();}); - grooveEvents = new std::thread([this](){while(!this->finishedLaunchScan){std::this_thread::sleep_for(std::chrono::milliseconds(200));}[this](){grooveEventLoop();};}); - } - else - {*/ - grooveAudioScanner = new std::thread([this](){grooveAudioScannerLoop();}); - grooveEvents = new std::thread([this](){grooveEventLoop();}); - //} + + grooveAudioScanner = new std::thread([this](){grooveAudioScannerLoop();}); + grooveEvents = new std::thread([this](){grooveEventLoop();}); + } std::list GroovePlayerMgr::getNextVoteBatch(Wt::Dbo::Session* session) @@ -503,6 +491,5 @@ void GroovePlayerMgr::grooveAudioScannerLoop() } //Now check for tracks in DB without a file. removeOrphanedTracks(&sqlSession); - finishedLaunchScan = true; } diff --git a/src/GroovePlayer.h b/src/GroovePlayer.h index 5ee15d0..b03d5f9 100644 --- a/src/GroovePlayer.h +++ b/src/GroovePlayer.h @@ -57,7 +57,6 @@ private: Wt::Dbo::backend::Sqlite3 sqliteConnection; Wt::Dbo::FixedSqlConnectionPool connectionPool; bool continueEventLoop = true; - bool finishedLaunchScan = false; std::list requestQueue; std::list lastInternalEvents; -- GitLab