diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-01-05 09:52:49 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-01-05 09:52:49 +0100 |
| commit | 0176743740b93429ad2ff73693815915a3ad1a7d (patch) | |
| tree | 6d33ed8c3436aa6166b1df99a3897b357830d207 /src/library/columncache.cpp | |
| parent | 71a8fa95921871f2d555875bf08519bb23c05d3d (diff) | |
| parent | 9e43434a115a12728a9c065e687e72da7ea7eff0 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# src/library/basetrackcache.cpp
# src/library/dao/trackschema.h
Diffstat (limited to 'src/library/columncache.cpp')
| -rw-r--r-- | src/library/columncache.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/library/columncache.cpp b/src/library/columncache.cpp index 1fd2c16ca5..b3aec6ac43 100644 --- a/src/library/columncache.cpp +++ b/src/library/columncache.cpp @@ -48,7 +48,6 @@ void ColumnCache::setColumns(const QStringList& columns) { insertColumnNameByEnum(COLUMN_LIBRARYTABLE_GROUPING, LIBRARYTABLE_GROUPING); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_TRACKNUMBER, LIBRARYTABLE_TRACKNUMBER); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_FILETYPE, LIBRARYTABLE_FILETYPE); - insertColumnNameByEnum(COLUMN_LIBRARYTABLE_NATIVELOCATION, LIBRARYTABLE_LOCATION); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_COMMENT, LIBRARYTABLE_COMMENT); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_DURATION, LIBRARYTABLE_DURATION); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_BITRATE, LIBRARYTABLE_BITRATE); @@ -78,14 +77,13 @@ void ColumnCache::setColumns(const QStringList& columns) { insertColumnNameByEnum(COLUMN_LIBRARYTABLE_COVERART_DIGEST, LIBRARYTABLE_COVERART_DIGEST); insertColumnNameByEnum(COLUMN_LIBRARYTABLE_COVERART_HASH, LIBRARYTABLE_COVERART_HASH); + insertColumnNameByEnum(COLUMN_TRACKLOCATIONSTABLE_LOCATION, TRACKLOCATIONSTABLE_LOCATION); insertColumnNameByEnum(COLUMN_TRACKLOCATIONSTABLE_FSDELETED, TRACKLOCATIONSTABLE_FSDELETED); insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_TRACKID, PLAYLISTTRACKSTABLE_TRACKID); insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_POSITION, PLAYLISTTRACKSTABLE_POSITION); insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_PLAYLISTID, PLAYLISTTRACKSTABLE_PLAYLISTID); - insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_LOCATION, PLAYLISTTRACKSTABLE_LOCATION); - insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_ARTIST, PLAYLISTTRACKSTABLE_ARTIST); - insertColumnNameByEnum(COLUMN_PLAYLISTTRACKSTABLE_TITLE, PLAYLISTTRACKSTABLE_TITLE); + insertColumnNameByEnum( COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED, PLAYLISTTRACKSTABLE_DATETIMEADDED); @@ -114,16 +112,13 @@ void ColumnCache::setColumns(const QStringList& columns) { insertColumnSortByEnum(COLUMN_LIBRARYTABLE_GROUPING, kSortNoCaseLex); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_TRACKNUMBER, kSortInt); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_FILETYPE, kSortNoCase); - insertColumnSortByEnum(COLUMN_LIBRARYTABLE_NATIVELOCATION, kSortNoCase); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_COMMENT, kSortNoCaseLex); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_BITRATE, kSortInt); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_BPM, kSortInt); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_SAMPLERATE, kSortInt); insertColumnSortByEnum(COLUMN_LIBRARYTABLE_TIMESPLAYED, kSortInt); - insertColumnSortByEnum(COLUMN_PLAYLISTTRACKSTABLE_LOCATION, kSortNoCase); - insertColumnSortByEnum(COLUMN_PLAYLISTTRACKSTABLE_ARTIST, kSortNoCaseLex); - insertColumnSortByEnum(COLUMN_PLAYLISTTRACKSTABLE_TITLE, kSortNoCaseLex); + insertColumnSortByEnum(COLUMN_TRACKLOCATIONSTABLE_LOCATION, kSortNoCase); slotSetKeySortOrder(m_pKeyNotationCP->get()); } |