Skip to content
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

Jump to bottom

Don't reject file metadata Keys values with non Minor/Major scales. #11001

Merged
merged 11 commits into from Aug 8, 2023
Merged

Don't reject file metadata Keys values with non Minor/Major scales. #11001

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
36f1c1e
Match Lancelot and OpenKey notation case sensitive to avoid ambitious…
daschuer Oct 24, 2022
76cc59e
Match Lancelot and OpenKey notation case sensitive to avoid ambitious…
daschuer Mar 19, 2023
6a88dba
Allow advanced modes in Lancelot notation
daschuer Oct 24, 2022
5548e27
Allow advanced modes in traditional key notations
daschuer Oct 24, 2022
5d51208
Introduce an anonymous namespace and improve constantness
daschuer Oct 24, 2022
fba6a41
Added Test for the advanced scale mode notation
daschuer Oct 24, 2022
47d4962
Add a comment about double sharps
daschuer Aug 8, 2023
d68717f
Introduce s_lancelotMajorModes
daschuer Aug 8, 2023
be1bf06
Join scale mode info structs
daschuer Aug 8, 2023
747c3f4
Make s_scaleModeInfo position independent
daschuer Aug 8, 2023
92ea4e6
Access s_scaleModeInfo in a range based loop
daschuer Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 42 additions & 15 deletions src/test/keyutilstest.cpp
View file
Open in desktop
Expand Up @@ -12,11 +12,6 @@ class KeyUtilsTest : public testing::Test {
};

TEST_F(KeyUtilsTest, OpenKeyNotation) {
EXPECT_EQ(mixxx::track::io::key::C_MAJOR,
KeyUtils::guessKeyFromText("1D"));
EXPECT_EQ(mixxx::track::io::key::C_SHARP_MINOR,
KeyUtils::guessKeyFromText("5M"));

// Lower-case.
EXPECT_EQ(mixxx::track::io::key::B_MAJOR,
KeyUtils::guessKeyFromText("6d"));
Expand All @@ -37,18 +32,12 @@ TEST_F(KeyUtilsTest, LancelotNotation) {
EXPECT_EQ(mixxx::track::io::key::C_SHARP_MINOR,
KeyUtils::guessKeyFromText("12A"));

// Lower-case.
EXPECT_EQ(mixxx::track::io::key::B_MAJOR,
KeyUtils::guessKeyFromText("1b"));
EXPECT_EQ(mixxx::track::io::key::B_MINOR,
KeyUtils::guessKeyFromText("10a"));

// whitespace is ok
EXPECT_EQ(mixxx::track::io::key::B_MINOR,
KeyUtils::guessKeyFromText("\t10a "));
KeyUtils::guessKeyFromText("\t10A "));
// but other stuff is not
EXPECT_EQ(mixxx::track::io::key::INVALID,
KeyUtils::guessKeyFromText("\t10aa "));
KeyUtils::guessKeyFromText("\t10AA "));
}

TEST_F(KeyUtilsTest, KeyNameNotation) {
Expand Down Expand Up @@ -170,10 +159,10 @@ TEST_F(KeyUtilsTest, KeyNameNotation) {
KeyUtils::guessKeyFromText("Ab -50cents"));
EXPECT_EQ(mixxx::track::io::key::A_FLAT_MAJOR, // ionian
KeyUtils::guessKeyFromText("04B -50cents"));
EXPECT_EQ(mixxx::track::io::key::A_FLAT_MAJOR, // ionian
KeyUtils::guessKeyFromText(" 4b -50 cents "));
// Mixxx does not allow this but Rapid Evolution
// EXPECT_EQ(mixxx::track::io::key::A_FLAT_MAJOR, // ionian
// KeyUtils::guessKeyFromText(" 4b -50 cents "));
// EXPECT_EQ(mixxx::track::io::key::A_FLAT_MAJOR, // ionian
// KeyUtils::guessKeyFromText(" g # - 50 cents "));
// EXPECT_EQ(mixxx::track::io::key::A_FLAT_MAJOR, // ionian
// KeyUtils::guessKeyFromText(" g # + 50 cents "));
Expand All @@ -185,6 +174,44 @@ TEST_F(KeyUtilsTest, KeyNameNotation) {
KeyUtils::guessKeyFromText("xyz"));
}

TEST_F(KeyUtilsTest, ScaleModeNotation) {
EXPECT_EQ(mixxx::track::io::key::C_MAJOR,
KeyUtils::guessKeyFromText("C ionian"));
EXPECT_EQ(mixxx::track::io::key::A_MINOR,
KeyUtils::guessKeyFromText("A aeolian"));
EXPECT_EQ(mixxx::track::io::key::C_MAJOR,
KeyUtils::guessKeyFromText("F lydian"));
EXPECT_EQ(mixxx::track::io::key::C_MAJOR,
KeyUtils::guessKeyFromText("G mixolydian"));
EXPECT_EQ(mixxx::track::io::key::A_MINOR,
KeyUtils::guessKeyFromText("D dorian"));
EXPECT_EQ(mixxx::track::io::key::A_MINOR,
KeyUtils::guessKeyFromText("E phrygian"));
EXPECT_EQ(mixxx::track::io::key::A_MINOR,
KeyUtils::guessKeyFromText("B locrian"));

EXPECT_EQ(mixxx::track::io::key::F_SHARP_MINOR,
KeyUtils::guessKeyFromText("11A"));
EXPECT_EQ(mixxx::track::io::key::A_MAJOR,
KeyUtils::guessKeyFromText("11B"));
EXPECT_EQ(mixxx::track::io::key::A_MAJOR,
KeyUtils::guessKeyFromText("11I"));
EXPECT_EQ(mixxx::track::io::key::A_MAJOR,
KeyUtils::guessKeyFromText("11L"));
EXPECT_EQ(mixxx::track::io::key::A_MAJOR,
KeyUtils::guessKeyFromText("11M"));
EXPECT_EQ(mixxx::track::io::key::F_SHARP_MINOR,
KeyUtils::guessKeyFromText("11D"));
EXPECT_EQ(mixxx::track::io::key::F_SHARP_MINOR,
KeyUtils::guessKeyFromText("11P"));
EXPECT_EQ(mixxx::track::io::key::F_SHARP_MINOR,
KeyUtils::guessKeyFromText("11C"));

// Redundant Mode
EXPECT_EQ(mixxx::track::io::key::INVALID,
KeyUtils::guessKeyFromText("Cm ionian"));
}

mixxx::track::io::key::ChromaticKey incrementKey(
mixxx::track::io::key::ChromaticKey key, int steps=1) {
return static_cast<mixxx::track::io::key::ChromaticKey>(
Expand Down