From f7317c938065312e871c98cee934b8c358b66683 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Fri, 10 Jan 2020 07:52:16 -0500 Subject: [PATCH] Tiny KBM fixes 1. Load .kbm files for kbm loader 2. Temperament, not Temprament Also add Nathan Kopp to the AUTHORS file Closes #1467 --- AUTHORS | 1 + src/common/SurgeStorage.cpp | 2 +- src/common/Tunings.cpp | 2 +- src/common/Tunings.h | 2 +- src/common/gui/SurgeGUIEditor.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index aecbf8c74f0..490901e28af 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ Alec DiAstra Rich Elmes The Emu (J Riley Hill) EvilDragon +Nathan Kopp Erik-Jan Maalderink Kjetil Matheussen Dave Palmer diff --git a/src/common/SurgeStorage.cpp b/src/common/SurgeStorage.cpp index 6d22925592a..1f6fb67096b 100644 --- a/src/common/SurgeStorage.cpp +++ b/src/common/SurgeStorage.cpp @@ -1446,7 +1446,7 @@ bool SurgeStorage::remapToKeyboard(const Surge::Storage::KeyboardMapping& k) if( ! currentScale.isValid() ) { // We need to set the current scale to a default scale - retuneToScale(Surge::Storage::Scale::evenTemprament12NoteScale()); + retuneToScale(Surge::Storage::Scale::evenTemperament12NoteScale()); } else { diff --git a/src/common/Tunings.cpp b/src/common/Tunings.cpp index f779693e71e..0ceedd11754 100644 --- a/src/common/Tunings.cpp +++ b/src/common/Tunings.cpp @@ -118,7 +118,7 @@ Surge::Storage::Scale Surge::Storage::parseSCLData(const std::string &d) return res; } -Surge::Storage::Scale Surge::Storage::Scale::evenTemprament12NoteScale() +Surge::Storage::Scale Surge::Storage::Scale::evenTemperament12NoteScale() { auto data = R"SCL(! even.scl ! diff --git a/src/common/Tunings.h b/src/common/Tunings.h index 098849cc58d..7ac75b22f01 100644 --- a/src/common/Tunings.h +++ b/src/common/Tunings.h @@ -44,7 +44,7 @@ struct Scale std::string toHtml(SurgeStorage *storage); - static Scale evenTemprament12NoteScale(); + static Scale evenTemperament12NoteScale(); }; struct KeyboardMapping diff --git a/src/common/gui/SurgeGUIEditor.cpp b/src/common/gui/SurgeGUIEditor.cpp index f53fdf1ab17..50dc8b87208 100644 --- a/src/common/gui/SurgeGUIEditor.cpp +++ b/src/common/gui/SurgeGUIEditor.cpp @@ -3524,7 +3524,7 @@ VSTGUI::COptionMenu *SurgeGUIEditor::makeTuningMenu(VSTGUI::CRect &menuRect) } }; Surge::UserInteractions::promptFileOpenDialog(this->synth->storage.userDataPath, - ".scl", + ".kbm", cb); } );