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

core: change chord kind enum numeric suffix spellings #105

Merged
merged 1 commit into from
Jul 7, 2020
Merged

core: change chord kind enum numeric suffix spellings #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ On 2020-05-31, two tags were deleted from origin, `v1.0.0` and `v1.0.1` and repl
If you cloned/forked the repository before 2020-05-31, consider making a new clone/fork or otherwise repairing the tags.

## [Unreleased]
- Change the spelling of `KindValue` enums from, e.g. `dominant11Th` to `dominant11th`. [#105]

[#105]: https://github.com/webern/mx/pull/105

## [v0.5.1] - 2020-06-13
- Fix xcode build, new headers were missing from frameworks.
Expand Down
24 changes: 12 additions & 12 deletions Sourcecode/private/mx/core/Enums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,12 +1407,12 @@ namespace mx
else if ( value == "dominant-ninth" ) { return KindValue::dominantNinth; }
else if ( value == "major-ninth" ) { return KindValue::majorNinth; }
else if ( value == "minor-ninth" ) { return KindValue::minorNinth; }
else if ( value == "dominant-11th" ) { return KindValue::dominant11Th; }
else if ( value == "major-11th" ) { return KindValue::major11Th; }
else if ( value == "minor-11th" ) { return KindValue::minor11Th; }
else if ( value == "dominant-13th" ) { return KindValue::dominant13Th; }
else if ( value == "major-13th" ) { return KindValue::major13Th; }
else if ( value == "minor-13th" ) { return KindValue::minor13Th; }
else if ( value == "dominant-11th" ) { return KindValue::dominant11th; }
else if ( value == "major-11th" ) { return KindValue::major11th; }
else if ( value == "minor-11th" ) { return KindValue::minor11th; }
else if ( value == "dominant-13th" ) { return KindValue::dominant13th; }
else if ( value == "major-13th" ) { return KindValue::major13th; }
else if ( value == "minor-13th" ) { return KindValue::minor13th; }
else if ( value == "suspended-second" ) { return KindValue::suspendedSecond; }
else if ( value == "suspended-fourth" ) { return KindValue::suspendedFourth; }
else if ( value == "Neapolitan" ) { return KindValue::neapolitan; }
Expand Down Expand Up @@ -1447,12 +1447,12 @@ namespace mx
case KindValue::dominantNinth: { return "dominant-ninth"; }
case KindValue::majorNinth: { return "major-ninth"; }
case KindValue::minorNinth: { return "minor-ninth"; }
case KindValue::dominant11Th: { return "dominant-11th"; }
case KindValue::major11Th: { return "major-11th"; }
case KindValue::minor11Th: { return "minor-11th"; }
case KindValue::dominant13Th: { return "dominant-13th"; }
case KindValue::major13Th: { return "major-13th"; }
case KindValue::minor13Th: { return "minor-13th"; }
case KindValue::dominant11th: { return "dominant-11th"; }
case KindValue::major11th: { return "major-11th"; }
case KindValue::minor11th: { return "minor-11th"; }
case KindValue::dominant13th: { return "dominant-13th"; }
case KindValue::major13th: { return "major-13th"; }
case KindValue::minor13th: { return "minor-13th"; }
case KindValue::suspendedSecond: { return "suspended-second"; }
case KindValue::suspendedFourth: { return "suspended-fourth"; }
case KindValue::neapolitan: { return "Neapolitan"; }
Expand Down
12 changes: 6 additions & 6 deletions Sourcecode/private/mx/core/Enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,12 +833,12 @@ namespace mx
dominantNinth = 13,
majorNinth = 14,
minorNinth = 15,
dominant11Th = 16,
major11Th = 17,
minor11Th = 18,
dominant13Th = 19,
major13Th = 20,
minor13Th = 21,
dominant11th = 16,
major11th = 17,
minor11th = 18,
dominant13th = 19,
major13th = 20,
minor13th = 21,
suspendedSecond = 22,
suspendedFourth = 23,
neapolitan = 24,
Expand Down
12 changes: 6 additions & 6 deletions Sourcecode/private/mx/impl/Converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,12 +1326,12 @@ namespace mx
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::dominantNinth, api::ChordKind::dominantNinth },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::majorNinth, api::ChordKind::majorNinth },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::minorNinth, api::ChordKind::minorNinth },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::dominant11Th, api::ChordKind::dominant11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::major11Th, api::ChordKind::major11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::minor11Th, api::ChordKind::minor11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::dominant13Th, api::ChordKind::dominant13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::major13Th, api::ChordKind::major13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::minor13Th, api::ChordKind::minor13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::dominant11th, api::ChordKind::dominant11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::major11th, api::ChordKind::major11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::minor11th, api::ChordKind::minor11Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::dominant13th, api::ChordKind::dominant13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::major13th, api::ChordKind::major13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::minor13th, api::ChordKind::minor13Th },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::suspendedSecond, api::ChordKind::suspendedSecond },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::suspendedFourth, api::ChordKind::suspendedFourth },
std::pair<core::KindValue, api::ChordKind>{ core::KindValue::neapolitan, api::ChordKind::neapolitan },
Expand Down
12 changes: 6 additions & 6 deletions Sourcecode/private/mxtest/core/EnumsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4850,7 +4850,7 @@ TEST( KindValue_minorNinth, Enums )

TEST( KindValue_dominant11Th, Enums )
{
KindValue e = KindValue::dominant11Th;
KindValue e = KindValue::dominant11th;
std::string expected = "dominant-11th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand All @@ -4871,7 +4871,7 @@ TEST( KindValue_dominant11Th, Enums )

TEST( KindValue_major11Th, Enums )
{
KindValue e = KindValue::major11Th;
KindValue e = KindValue::major11th;
std::string expected = "major-11th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand All @@ -4892,7 +4892,7 @@ TEST( KindValue_major11Th, Enums )

TEST( KindValue_minor11Th, Enums )
{
KindValue e = KindValue::minor11Th;
KindValue e = KindValue::minor11th;
std::string expected = "minor-11th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand All @@ -4913,7 +4913,7 @@ TEST( KindValue_minor11Th, Enums )

TEST( KindValue_dominant13Th, Enums )
{
KindValue e = KindValue::dominant13Th;
KindValue e = KindValue::dominant13th;
std::string expected = "dominant-13th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand All @@ -4934,7 +4934,7 @@ TEST( KindValue_dominant13Th, Enums )

TEST( KindValue_major13Th, Enums )
{
KindValue e = KindValue::major13Th;
KindValue e = KindValue::major13th;
std::string expected = "major-13th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand All @@ -4955,7 +4955,7 @@ TEST( KindValue_major13Th, Enums )

TEST( KindValue_minor13Th, Enums )
{
KindValue e = KindValue::minor13Th;
KindValue e = KindValue::minor13th;
std::string expected = "minor-13th";
std::string actual = toString( e );
CHECK_EQUAL( expected, actual );
Expand Down
2 changes: 1 addition & 1 deletion Sourcecode/private/mxtest/core/HarmonyChordGroupTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ namespace mxtest
{
o->setRoot( tgenRoot( v ) );
o->setChoice( HarmonyChordGroup::Choice::root );
o->getKind()->setValue( KindValue::dominant13Th );
o->getKind()->setValue( KindValue::dominant13th );
o->setHasBass( true );
o->setBass( tgenBass( v ) );
o->addDegree( tgenDegree( variant::one ) );
Expand Down