Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into library-autodj-fixes

# Conflicts:
#	src/library/baseplaylistfeature.cpp
#	src/library/baseplaylistfeature.h
#	src/widget/wtracktableview.cpp

115 files changed, 1970 insertions, 1479 deletions

diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
index 9e26df04f3..a6f7f0802e 100644
--- a/src/analyzer/analyzerthread.cpp
+++ b/src/analyzer/analyzerthread.cpp
@@ -81,7 +81,7 @@ AnalyzerThread::AnalyzerThread(
         : WorkerThread(QString("AnalyzerThread %1").arg(id)),
           m_id(id),
           m_dbConnectionPool(std::move(dbConnectionPool)),
-          m_pConfig(std::move(pConfig)),
+          m_pConfig(pConfig),
           m_modeFlags(modeFlags),
           m_nextTrack(2), // minimum capacity
           m_sampleBuffer(mixxx::kAnalysisSamplesPerChunk),
diff --git a/src/analyzer/trackanalysisscheduler.cpp b/src/analyzer/trackanalysisscheduler.cpp
index 8c91fdb8c9..45179a6105 100644
--- a/src/analyzer/trackanalysisscheduler.cpp
+++ b/src/analyzer/trackanalysisscheduler.cpp
@@ -275,7 +275,7 @@ bool TrackAnalysisScheduler::submitNextTrack(Worker* worker) {
         DEBUG_ASSERT(nextTrackId.isValid());
         if (nextTrackId.isValid()) {
             TrackPointer nextTrack =
-                    m_library->trackCollection().getTrackDAO().getTrack(nextTrackId);
+                    m_library->trackCollection().getTrackById(nextTrackId);
             if (nextTrack) {
                 if (m_pendingTrackIds.insert(nextTrackId).second) {
                     if (worker->submitNextTrack(std::move(nextTrack))) {
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 9cc6be386c..b892761f30 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -75,7 +75,7 @@ class Controller : public QObject, ConstControllerPresetVisitor {
   // only signal them which allows us to use no locks.
   protected slots:
     // TODO(XXX) move this into the inherited classes since is not called here
-    // (vie Controller) and re-implemented anyway in most cases.
+    // (via Controller) and re-implemented anyway in most cases.
 
     // Handles packets of raw bytes and passes them to an ".incomingData" script
     // function that is assumed to exist. (Sub-classes may want to reimplement
diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp
index 933e31ebbb..9515f300f9 100644
--- a/src/engine/controls/ratecontrol.cpp
+++ b/src/engine/controls/ratecontrol.cpp
@@ -37,7 +37,7 @@ RateControl::RateControl(QString group,
       m_dRateTempRampChange(0.0) {
     m_pScratchController = new PositionScratchController(group);
 
-    // This is the resulting rate ratio that can used for dispaly or calculations.
+    // This is the resulting rate ratio that can be used for display or calculations.
     // The track original rate ratio is 1.
     m_pRateRatio = new ControlObject(ConfigKey(group, "rate_ratio"),
                   true, false, false, 1.0);
diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp
index 88f97815ee..fea9c4018c 100644
--- a/src/engine/sidechain/shoutconnection.cpp
+++ b/src/engine/sidechain/shoutconnection.cpp
@@ -790,7 +790,7 @@ void ShoutConnection::updateMetaData() {
      * Also note: Do not try to include Vorbis comments in OGG packages and send them to stream.
      * This was done in EncoderVorbis previously and caused interruptions on track change as well
      * which sounds awful to listeners.
-     * To conlcude: Only write OGG metadata one time, i.e., if static metadata is used.
+     * To conclude: Only write OGG metadata one time, i.e., if static metadata is used.
      */
 
 
diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp
index 9ff6e0fcaf..0a4a7bfb23 100644
--- a/src/library/analysisfeature.cpp
+++ b/src/library/analysisfeature.cpp
@@ -16,15 +16,23 @@
 #include "sources/soundsourceproxy.h"
 #include "util/dnd.h"
 #include "util/debug.h"
-
-const QString AnalysisFeature::m_sAnalysisViewName = QString("Analysis");
+#include "util/logger.h"
 
 namespace {
 
+const mixxx::Logger kLogger("AnalysisFeature");
+
+const QString kViewName = QStringLiteral("Analysis");
+
 // Utilize all available cores for batch analysis of tracks
 const int kNumberOfAnalyzerThreads = math_max(1, QThread::idealThreadCount());
 
 inline
+int numberOfAnalyzerThreads() {
+    return kNumberOfAnalyzerThreads;
+}
+
+inline
 AnalyzerModeFlags getAnalyzerModeFlags(
         const UserSettingsPointer& pConfig) {
     // Always enable at least BPM detection for batch analysis, even if disabled
@@ -42,50 +50,34 @@ AnalyzerModeFlags getAnalyzerModeFlags(
 } // anonymous namespace
 
 AnalysisFeature::AnalysisFeature(
-        Library* paren