diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-04 18:46:27 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-04 18:46:27 +0100 |
| commit | b7171a2b97f7671125abe6ebb8bfffd31ff3e14f (patch) | |
| tree | fe1183c2054335bbe8b321dbb88a356aae7a1cbc /src/library/serato | |
| parent | 4813d0ecab0eed0fece4a7a6868204ba151ea877 (diff) | |
LIBRARYTABLE_LOCATION to LIBRARYTABLE_LOCATION_ID because the column holds only a reference to the track locations table. Use the enum COLUMN_TRACKLOCATIONSTABLE_LOCATION instead of COLUMN_LIBRARYTABLE_NATIVELOCATION becase it points only to the id column. Delete also enums for non existing Playlist table columns.
Diffstat (limited to 'src/library/serato')
| -rw-r--r-- | src/library/serato/seratofeature.cpp | 6 | ||||
| -rw-r--r-- | src/library/serato/seratoplaylistmodel.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/library/serato/seratofeature.cpp b/src/library/serato/seratofeature.cpp index 06d92aeb73..be6c26d56d 100644 --- a/src/library/serato/seratofeature.cpp +++ b/src/library/serato/seratofeature.cpp @@ -507,7 +507,7 @@ QString parseDatabase(mixxx::DbConnectionPoolPtr dbConnectionPool, TreeItem* dat LIBRARYTABLE_SAMPLERATE + ", " + LIBRARYTABLE_BPM + ", " + LIBRARYTABLE_KEY + ", " + - LIBRARYTABLE_LOCATION + ", " + + TRACKLOCATIONSTABLE_LOCATION + ", " + LIBRARYTABLE_BPM_LOCK + ", " + LIBRARYTABLE_DATETIMEADDED + ", " @@ -866,7 +866,7 @@ SeratoFeature::SeratoFeature( << LIBRARYTABLE_BPM << LIBRARYTABLE_KEY << LIBRARYTABLE_TRACKNUMBER - << LIBRARYTABLE_LOCATION + << TRACKLOCATIONSTABLE_LOCATION << LIBRARYTABLE_BPM_LOCK; QStringList searchColumns; @@ -877,7 +877,7 @@ SeratoFeature::SeratoFeature( << LIBRARYTABLE_YEAR << LIBRARYTABLE_GENRE << LIBRARYTABLE_TRACKNUMBER - << LIBRARYTABLE_LOCATION + << TRACKLOCATIONSTABLE_LOCATION << LIBRARYTABLE_COMMENT << LIBRARYTABLE_DURATION << LIBRARYTABLE_BITRATE diff --git a/src/library/serato/seratoplaylistmodel.cpp b/src/library/serato/seratoplaylistmodel.cpp index 3fe689e12b..93fad052d8 100644 --- a/src/library/serato/seratoplaylistmodel.cpp +++ b/src/library/serato/seratoplaylistmodel.cpp @@ -40,7 +40,7 @@ void SeratoPlaylistModel::initSortColumnMapping() { fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_FILETYPE); m_columnIndexBySortColumnId[static_cast<int>( TrackModel::SortColumnId::NativeLocation)] = - fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION); + fieldIndex(ColumnCache::COLUMN_TRACKLOCATIONSTABLE_LOCATION); m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Comment)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COMMENT); m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Duration)] = |