diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/dao/trackschema.h | 40 | ||||
| -rw-r--r-- | src/library/mixxxlibraryfeature.cpp | 38 |
2 files changed, 39 insertions, 39 deletions
diff --git a/src/library/dao/trackschema.h b/src/library/dao/trackschema.h index de3d2b057f..befc626e47 100644 --- a/src/library/dao/trackschema.h +++ b/src/library/dao/trackschema.h @@ -1,8 +1,6 @@ -#ifndef MIXXX_TRACKSCHEMA_H -#define MIXXX_TRACKSCHEMA_H +#pragma once #include <QString> -#include <QStringList> #define LIBRARY_TABLE "library" #define TRACKLOCATIONS_TABLE "track_locations" @@ -56,45 +54,9 @@ const QString TRACKLOCATIONSTABLE_NEEDSVERIFICATION = "needs_verification"; const QString REKORDBOX_ANALYZE_PATH = "analyze_path"; -const QStringList DEFAULT_COLUMNS = { - LIBRARYTABLE_ID, - LIBRARYTABLE_PLAYED, - LIBRARYTABLE_TIMESPLAYED, - //has to be up here otherwise Played and TimesPlayed are not shown - LIBRARYTABLE_ALBUMARTIST, - LIBRARYTABLE_ALBUM, - LIBRARYTABLE_ARTIST, - LIBRARYTABLE_TITLE, - LIBRARYTABLE_YEAR, - LIBRARYTABLE_RATING, - LIBRARYTABLE_GENRE, - LIBRARYTABLE_COMPOSER, - LIBRARYTABLE_GROUPING, - LIBRARYTABLE_TRACKNUMBER, - LIBRARYTABLE_KEY, - LIBRARYTABLE_KEY_ID, - LIBRARYTABLE_BPM, - LIBRARYTABLE_BPM_LOCK, - LIBRARYTABLE_DURATION, - LIBRARYTABLE_BITRATE, - LIBRARYTABLE_REPLAYGAIN, - LIBRARYTABLE_FILETYPE, - LIBRARYTABLE_DATETIMEADDED, - TRACKLOCATIONSTABLE_LOCATION, - TRACKLOCATIONSTABLE_FSDELETED, - LIBRARYTABLE_COMMENT, - LIBRARYTABLE_MIXXXDELETED, - LIBRARYTABLE_COLOR, - LIBRARYTABLE_COVERART_SOURCE, - LIBRARYTABLE_COVERART_TYPE, - LIBRARYTABLE_COVERART_LOCATION, - LIBRARYTABLE_COVERART_HASH}; - namespace mixxx { namespace trackschema { // TableForColumn returns the name of the table that contains the named column. QString tableForColumn(const QString& columnName); } // namespace trackschema } // namespace mixxx - -#endif //MIXXX_TRACKSCHEMA_H diff --git a/src/library/mixxxlibraryfeature.cpp b/src/library/mixxxlibraryfeature.cpp index 1e38c3fce3..33ea90143c 100644 --- a/src/library/mixxxlibraryfeature.cpp +++ b/src/library/mixxxlibraryfeature.cpp @@ -20,6 +20,44 @@ #include "util/dnd.h" #include "widget/wlibrary.h" +namespace { + +const QStringList DEFAULT_COLUMNS = { + LIBRARYTABLE_ID, + LIBRARYTABLE_PLAYED, + LIBRARYTABLE_TIMESPLAYED, + //has to be up here otherwise Played and TimesPlayed are not shown + LIBRARYTABLE_ALBUMARTIST, + LIBRARYTABLE_ALBUM, + LIBRARYTABLE_ARTIST, + LIBRARYTABLE_TITLE, + LIBRARYTABLE_YEAR, + LIBRARYTABLE_RATING, + LIBRARYTABLE_GENRE, + LIBRARYTABLE_COMPOSER, + LIBRARYTABLE_GROUPING, + LIBRARYTABLE_TRACKNUMBER, + LIBRARYTABLE_KEY, + LIBRARYTABLE_KEY_ID, + LIBRARYTABLE_BPM, + LIBRARYTABLE_BPM_LOCK, + LIBRARYTABLE_DURATION, + LIBRARYTABLE_BITRATE, + LIBRARYTABLE_REPLAYGAIN, + LIBRARYTABLE_FILETYPE, + LIBRARYTABLE_DATETIMEADDED, + TRACKLOCATIONSTABLE_LOCATION, + TRACKLOCATIONSTABLE_FSDELETED, + LIBRARYTABLE_COMMENT, + LIBRARYTABLE_MIXXXDELETED, + LIBRARYTABLE_COLOR, + LIBRARYTABLE_COVERART_SOURCE, + LIBRARYTABLE_COVERART_TYPE, + LIBRARYTABLE_COVERART_LOCATION, + LIBRARYTABLE_COVERART_HASH}; + +} // namespace + MixxxLibraryFeature::MixxxLibraryFeature(Library* pLibrary, UserSettingsPointer pConfig) : LibraryFeature(pLibrary, pConfig), |