From 83f327d911f85b891031f4a20a4bb20202351518 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 19 Feb 2017 23:16:33 -0800 Subject: [PATCH] Added one last missing dependency to CMakeLists.txt. Also, auto-rescan on startup. --- CMakeLists.txt | 2 +- src/core/library/Indexer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29789163e..d6ecc6992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ if (GENERATE_DEB MATCHES "1") set(CPACK_PACKAGE_VERSION_MAJOR "${musikbox_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${musikbox_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${musikbox_VERSION_PATCH}") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libboost-date-time${DEB_BOOST_VERSION}, libboost-atomic${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libogg0, libvorbis0a, libflac8, libfaad2, libncursesw5, libasound2, libpulse0, pulseaudio") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libboost-date-time${DEB_BOOST_VERSION}, libboost-atomic${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libflac8, libfaad2, libncursesw5, libasound2, libpulse0, pulseaudio") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "casey langen") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE}) set(CPACK_PACKAGE_FILE_NAME "musikbox_${musikbox_VERSION}_${DEB_ARCHITECTURE}") diff --git a/src/core/library/Indexer.cpp b/src/core/library/Indexer.cpp index 7cecf19f1..cc85bd28e 100644 --- a/src/core/library/Indexer.cpp +++ b/src/core/library/Indexer.cpp @@ -56,7 +56,7 @@ #define STRESS_TEST_DB 0 static const std::string TAG = "Indexer"; -static const int MAX_THREADS = 4; +static const int MAX_THREADS = 2; static const size_t NOTIFY_INTERVAL = 300; using namespace musik::core; @@ -377,7 +377,7 @@ void Indexer::ThreadLoop() { while (!this->Exited()) { this->restart = false; - if(!firstTime || (firstTime && prefs->GetBool(prefs::keys::SyncOnStartup, false))) { /* first time through the loop skips this */ + if(!firstTime || (firstTime && prefs->GetBool(prefs::keys::SyncOnStartup, true))) { /* first time through the loop skips this */ this->SynchronizeStart(); this->dbConnection.Open(this->dbFilename.c_str(), 0); /* ensure the db is open */