Merge pull request #2480 from Holzhaus/serato-library-feature

Add Serato library feature

CMakeLists.txt

@@ -398,6 +398,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/scanner/scannertask.cpp
   src/library/searchquery.cpp
   src/library/searchqueryparser.cpp
+  src/library/serato/seratofeature.cpp
+  src/library/serato/seratoplaylistmodel.cpp
   src/library/setlogfeature.cpp
   src/library/sidebarmodel.cpp
   src/library/songdownloader.cpp

build/depends.py

@@ -1081,6 +1081,8 @@ def sources(self, build):
 
                    "src/library/itunes/itunesfeature.cpp",
                    "src/library/traktor/traktorfeature.cpp",
+                   "src/library/serato/seratofeature.cpp",
+                   "src/library/serato/seratoplaylistmodel.cpp",
 
                    "src/library/rekordbox/rekordboxfeature.cpp",
                    "src/library/rekordbox/rekordbox_pdb.cpp",

res/mixxx.qrc

@@ -26,7 +26,8 @@
         <file>images/library/ic_library_recordings.svg</file>
         <file>images/library/ic_library_rhythmbox.svg</file>
         <file>images/library/ic_library_traktor.svg</file>
-        <file>images/library/ic_library_rekordbox.svg</file>        
+        <file>images/library/ic_library_rekordbox.svg</file>
+        <file>images/library/ic_library_serato.svg</file>
         <file>images/mixxx_logo.svg</file> <!-- logo in 'About' dialog -->
         <file>images/mixxx_icon.svg</file> <!-- icon in 'About' dialog -->
         <file>images/mixxx-icon-logo-symbolic.svg</file> <!-- default launch image -->

res/schema.xml

@@ -480,5 +480,5 @@ METADATA
         position INTEGER
         );
     </sql>
-  </revision>  
+  </revision>
 </schema>

src/library/library.cpp

@@ -20,6 +20,7 @@
 #include "library/trackcollectionmanager.h"
 #include "library/trackmodel.h"
 
+#include "library/analysisfeature.h"
 #include "library/autodj/autodjfeature.h"
 #include "library/banshee/bansheefeature.h"
 #include "library/browse/browsefeature.h"
@@ -28,11 +29,11 @@
 #include "library/mixxxlibraryfeature.h"
 #include "library/playlistfeature.h"
 #include "library/recording/recordingfeature.h"
+#include "library/rekordbox/rekordboxfeature.h"
 #include "library/rhythmbox/rhythmboxfeature.h"
+#include "library/serato/seratofeature.h"
 #include "library/setlogfeature.h"
 #include "library/traktor/traktorfeature.h"
-#include "library/rekordbox/rekordboxfeature.h"
-#include "library/analysisfeature.h"
 
 #include "mixer/playermanager.h"
 
@@ -168,6 +169,10 @@ Library::Library(
         addFeature(new RekordboxFeature(this, m_pConfig));
     }
 
+    if (m_pConfig->getValue(ConfigKey(kConfigGroup, "ShowSeratoLibrary"), true)) {
+        addFeature(new SeratoFeature(this, m_pConfig));
+    }
+
     for (const auto& externalTrackCollection : m_pTrackCollectionManager->externalCollections()) {
         auto feature = externalTrackCollection->newLibraryFeature(this, m_pConfig);
         if (feature) {