Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Serato library feature #2480

Merged
merged 36 commits into from
Feb 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ca3573b
library: Add Serato library feature
Holzhaus Jan 31, 2020
cd541e2
library/serato/seratofeature: Improve database track field parsing
Holzhaus Feb 1, 2020
144e8cb
library/serato/seratofeature: Add tracks to library playlist
Holzhaus Feb 1, 2020
3e91132
library/serato/seratofeature: Add support for parsing crates
Holzhaus Feb 1, 2020
9b56230
library/serato/seratofeature: Fix root view HTML text
Holzhaus Feb 1, 2020
f9f469f
library/serato/seratofeature: Use QStringLiteral for QString constants
Holzhaus Feb 2, 2020
b58ca84
library/serato/seratofeature: Fix non-const reference arguments
Holzhaus Feb 2, 2020
89be822
library/serato/seratofeature: Add kHeaderSize constexpr
Holzhaus Feb 2, 2020
dba8e03
library/serato/seratofeature: Add some more length checks and comments
Holzhaus Feb 2, 2020
dcfb353
library/serato/seratofeature: Use const reference as parseCrate param
Holzhaus Feb 2, 2020
5cc8bc8
Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library…
Holzhaus Feb 4, 2020
8e7b512
library/serato/seratofeature: Use const references for parseCrate()
Holzhaus Feb 4, 2020
66aec25
library/serato/seratofeature: Rename func to parseCrateTrackPath()
Holzhaus Feb 4, 2020
3e9a16f
library/serato/seratofeature: Improve findSeratoDatabases()
Holzhaus Feb 4, 2020
4d65886
library/serato/seratofeature: Add comment regarding track location usage
Holzhaus Feb 4, 2020
55bb572
library/serato/seratofeature: Rename byte conversion functions
Holzhaus Feb 4, 2020
e6e006b
library/serato/seratofeature: Break long lines
Holzhaus Feb 4, 2020
7a68125
library/serato/seratofeature: Only read field names when necessary
Holzhaus Feb 4, 2020
bba4cae
library/serato/seratofeature: Remove columns without headers from table
Holzhaus Feb 4, 2020
4509118
apply changes from git-clang-format
daschuer Feb 5, 2020
5fbc2fa
library/serato/seratofeature: Fix Serato tables names
Holzhaus Feb 5, 2020
7b96b03
library/serato/seratofeature: Fix playlist names in TreeItems
Holzhaus Feb 5, 2020
7eb72be
library/serato/seratofeature: Switch from persistent to temporary tables
Holzhaus Feb 5, 2020
0ae2bff
Merge pull request #2 from daschuer/serato-library-feature
Holzhaus Feb 5, 2020
c3c3e36
library/serato/seratofeature: Add icon to crate TreeItems
Holzhaus Feb 5, 2020
6063513
Merge branch 'master' of https://github.com/mixxxdj/mixxx into serato…
Holzhaus Feb 5, 2020
fd4d1df
library/serato/seratofeature: Fix Q_DISABLE_COPY(x) failures
Holzhaus Feb 9, 2020
63eed16
images/library/ic_library_serato.svg: Fix EOF in SVG image
Holzhaus Feb 11, 2020
092ff2f
Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library…
Holzhaus Feb 11, 2020
10b4eb7
library/serato/seratofeature: Add size check for TreeItem data
Holzhaus Feb 11, 2020
84bce36
library/serato/seratofeature: Remove unnecessary transaction
Holzhaus Feb 15, 2020
b3de621
library/serato: Move SeratoPlaylistModel into separate file
Holzhaus Feb 15, 2020
9e510b0
library/serato/seratofeature: Rename bytesToQString to utf16beToQString
Holzhaus Feb 15, 2020
13914af
library/serato/seratoplaylistmodel: Wrap long line manually
Holzhaus Feb 15, 2020
0c5c24e
Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library…
Holzhaus Feb 15, 2020
627d112
library/serato/seratofeature: Switch to new TreeItem initialization
Holzhaus Feb 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions build/depends.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
25 changes: 25 additions & 0 deletions res/images/library/ic_library_serato.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion res/mixxx.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion res/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -480,5 +480,5 @@ METADATA
position INTEGER
);
</sql>
</revision>
</revision>
</schema>
9 changes: 7 additions & 2 deletions src/library/library.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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) {
Expand Down
Loading