Skip to content

sort keys by circle of fifths in library display #649

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.

Sign up for GitHub

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

Closed
Be-ing wants to merge 2 commits into from
+50 −0
Closed

sort keys by circle of fifths in library display #649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37cf42a
sort keys by circle of fifths in library display
Be-ing Jul 17, 2015
5c6b56b
construct key sorting query string from array of ChromaticKeys
Be-ing Jul 17, 2015
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
50 changes: 50 additions & 0 deletions src/library/columncache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include "library/dao/trackdao.h"
#include "library/dao/playlistdao.h"
#include "library/dao/cratedao.h"
#include "track/keyutils.h"


void ColumnCache::setColumns(const QStringList& columns) {
m_columnsByIndex.clear();
Expand Down Expand Up @@ -71,6 +73,53 @@ void ColumnCache::setColumns(const QStringList& columns) {

const QString sortInt("cast(%1 as integer)");
const QString sortNoCase("lower(%1)");
const mixxx::track::io::key::ChromaticKey keysByCircleOfFifths[] = {
mixxx::track::io::key::INVALID,

mixxx::track::io::key::C_MAJOR,
mixxx::track::io::key::A_MINOR,

mixxx::track::io::key::G_MAJOR,
mixxx::track::io::key::E_MINOR,

mixxx::track::io::key::D_MAJOR,
mixxx::track::io::key::B_MINOR,

mixxx::track::io::key::A_MAJOR,
mixxx::track::io::key::F_SHARP_MINOR,

mixxx::track::io::key::E_MAJOR,
mixxx::track::io::key::C_SHARP_MINOR,

mixxx::track::io::key::B_MAJOR,
mixxx::track::io::key::G_SHARP_MINOR,

mixxx::track::io::key::F_SHARP_MAJOR,
mixxx::track::io::key::E_FLAT_MINOR,

mixxx::track::io::key::D_FLAT_MAJOR,
mixxx::track::io::key::B_FLAT_MINOR,

mixxx::track::io::key::A_FLAT_MAJOR,
mixxx::track::io::key::F_MINOR,

mixxx::track::io::key::E_FLAT_MAJOR,
mixxx::track::io::key::C_MINOR,

mixxx::track::io::key::B_FLAT_MAJOR,
mixxx::track::io::key::G_MINOR,

mixxx::track::io::key::F_MAJOR,
mixxx::track::io::key::D_MINOR
};

QString sortCircleOfFifths("CASE key_id ");
for (int i = 0; i <= 24; ++i) {
sortCircleOfFifths.append(QString("WHEN %1 THEN %2 ")
.arg(keysByCircleOfFifths[i]).arg(i));
}
sortCircleOfFifths.append("END");

m_columnSortByIndex.clear();
// Add the columns that requires a special sort
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_LIBRARYTABLE_ARTIST], sortNoCase);
Expand All @@ -85,6 +134,7 @@ void ColumnCache::setColumns(const QStringList& columns) {
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_LIBRARYTABLE_FILETYPE], sortNoCase);
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_LIBRARYTABLE_LOCATION], sortNoCase);
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_LIBRARYTABLE_COMMENT], sortNoCase);
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_LIBRARYTABLE_KEY], sortCircleOfFifths);

m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_PLAYLISTTRACKSTABLE_LOCATION], sortNoCase);
m_columnSortByIndex.insert(m_columnIndexByEnum[COLUMN_PLAYLISTTRACKSTABLE_ARTIST], sortNoCase);
Expand Down