Tiny KBM fixes

1. Load .kbm files for kbm loader 2. Temperament, not Temprament Also add Nathan Kopp to the AUTHORS file Closes surge-synthesizer#1467
baconpaul · Jan 10, 2020 · f7317c9 · f7317c9
1 parent b5f494e
commit f7317c9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -12,6 +12,7 @@ Alec DiAstra <[email protected]>
 Rich Elmes <[email protected]>
 The Emu (J Riley Hill)
 EvilDragon 
+Nathan Kopp <[email protected]>
 Erik-Jan Maalderink <[email protected]>
 Kjetil Matheussen <[email protected]>
 Dave Palmer <[email protected]>

diff --git 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
@@ -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
@@ -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
@@ -3524,7 +3524,7 @@ VSTGUI::COptionMenu *SurgeGUIEditor::makeTuningMenu(VSTGUI::CRect &menuRect)
                             }
                         };
                         Surge::UserInteractions::promptFileOpenDialog(this->synth->storage.userDataPath,
-                                                                      ".scl",
+                                                                      ".kbm",
                                                                       cb);
                     }
         );
-Original file line number
+Diff line change
@@ Expand Up @@
                                 }
                             };
                             Surge::UserInteractions::promptFileOpenDialog(this->synth->storage.userDataPath,
-                                                                          ".scl",
+                                                                          ".kbm",
                                                                           cb);
                         }
             );
@@ Expand Down @@