diff options
Diffstat (limited to 'src/library/serato')
-rw-r--r-- | src/library/serato/seratoplaylistmodel.cpp | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/src/library/serato/seratoplaylistmodel.cpp b/src/library/serato/seratoplaylistmodel.cpp index cb8be77a10..3fe689e12b 100644 --- a/src/library/serato/seratoplaylistmodel.cpp +++ b/src/library/serato/seratoplaylistmodel.cpp @@ -14,61 +14,67 @@ SeratoPlaylistModel::SeratoPlaylistModel(QObject* parent, void SeratoPlaylistModel::initSortColumnMapping() { // Add a bijective mapping between the SortColumnIds and column indices - for (int i = 0; i < TrackModel::SortColumnId::NUM_SORTCOLUMNIDS; ++i) { + for (int i = 0; i < static_cast<int>(TrackModel::SortColumnId::IdMax); ++i) { m_columnIndexBySortColumnId[i] = -1; } - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ARTIST] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Artist)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_ARTIST); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_TITLE] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Title)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_TITLE); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ALBUM] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Album)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_ALBUM); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ALBUMARTIST] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::AlbumArtist)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_ALBUMARTIST); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_YEAR] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Year)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_YEAR); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_GENRE] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Genre)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_GENRE); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_COMPOSER] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Composer)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COMPOSER); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_GROUPING] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Grouping)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_GROUPING); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_TRACKNUMBER] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::TrackNumber)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_TRACKNUMBER); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_FILETYPE] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::FileType)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_FILETYPE); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_NATIVELOCATION] = + m_columnIndexBySortColumnId[static_cast<int>( + TrackModel::SortColumnId::NativeLocation)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_COMMENT] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Comment)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COMMENT); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_DURATION] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Duration)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DURATION); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_BITRATE] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::BitRate)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_BITRATE); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_BPM] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Bpm)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_BPM); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_REPLAYGAIN] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::ReplayGain)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_REPLAYGAIN); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_DATETIMEADDED] = + m_columnIndexBySortColumnId[static_cast<int>( + TrackModel::SortColumnId::DateTimeAdded)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_TIMESPLAYED] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::TimesPlayed)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_TIMESPLAYED); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_RATING] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Rating)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_RATING); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_KEY] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Key)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_KEY); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_PREVIEW] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Preview)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PREVIEW); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_COVERART] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::CoverArt)] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COVERART); - m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_POSITION] = + m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::Position)] = fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_POSITION); m_sortColumnIdByColumnIndex.clear(); - for (int i = 0; i < TrackModel::SortColumnId::NUM_SORTCOLUMNIDS; ++i) { + for (int i = static_cast<int>(TrackModel::SortColumnId::IdMin); + i < static_cast<int>(TrackModel::SortColumnId::IdMax); + ++i) { TrackModel::SortColumnId sortColumn = static_cast<TrackModel::SortColumnId>(i); - m_sortColumnIdByColumnIndex.insert(m_columnIndexBySortColumnId[sortColumn], sortColumn); + m_sortColumnIdByColumnIndex.insert( + m_columnIndexBySortColumnId[static_cast<int>(sortColumn)], + sortColumn); } } |