Fix a bug with Async Prompts

the Async Prompt stuff earlier htis week to get MODAL_LOOPS on broke the non-modal Storage OkCancel. Defacto this meant that you could never replace a patch because the OK Cancel asked you but had already canceled. Closes surge-synthesizer#5045, where we had thought this was a global volume saving problem, but it was really an anything saving problem
baconpaul · Sep 10, 2021 · e161c17 · e161c17
1 parent 464d5c8
commit e161c17
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 53 deletions.
diff --git a/src/common/SurgeStorage.h b/src/common/SurgeStorage.h
@@ -928,14 +928,14 @@ class alignas(16) SurgeStorage
         CANCEL
     };
 
-    std::function<OkCancel(const std::string &msg, const std::string &title, OkCancel def)>
-        okCancelProvider =
-            [](const std::string &, const std::string &, OkCancel def) { return def; };
+    std::function<void(const std::string &msg, const std::string &title, OkCancel def,
+                       std::function<void(OkCancel)>)>
+        okCancelProvider = [](const std::string &, const std::string &, OkCancel def,
+                              std::function<void(OkCancel)> callback) { callback(def); };
     void clearOkCancelProvider()
     {
-        okCancelProvider = [](const std::string &, const std::string &, OkCancel def) {
-            return def;
-        };
+        okCancelProvider = [](const std::string &, const std::string &, OkCancel def,
+                              std::function<void(OkCancel)> callback) { callback(def); };
     }
 
     std::string initPatchName{"Init Saw"}, initPatchCategory{"Templates"};

diff --git a/src/common/SurgeSynthesizerIO.cpp b/src/common/SurgeSynthesizerIO.cpp
@@ -306,47 +306,48 @@ bool SurgeSynthesizer::loadPatchByPath(const char *fxpPath, int categoryId, cons
         }
         else
         {
-            auto okc = storage.okCancelProvider(
+            storage.okCancelProvider(
                 std::string("Loaded patch contains a custom tuning, but there is ") +
                     "already a user-selected tuning in place. Do you want to replace the currently "
                     "loaded tuning " +
                     "with the tuning stored in the patch? (The rest of the patch will load "
                     "normally.)",
-                "Replace Tuning", SurgeStorage::CANCEL);
-            if (okc == SurgeStorage::OK)
-            {
-                try
-                {
-                    if (storage.getPatch().patchTuning.scaleContents.size() > 1)
-                    {
-                        storage.retuneToScale(
-                            Tunings::parseSCLData(storage.getPatch().patchTuning.scaleContents));
-                    }
-                    else
-                    {
-                        storage.retuneTo12TETScale();
-                    }
-                    if (storage.getPatch().patchTuning.mappingContents.size() > 1)
-                    {
-                        auto kb =
-                            Tunings::parseKBMData(storage.getPatch().patchTuning.mappingContents);
-                        if (storage.getPatch().patchTuning.mappingName.size() > 1)
-                            kb.name = storage.getPatch().patchTuning.mappingName;
-                        else
-                            kb.name = storage.guessAtKBMName(kb);
-                        storage.remapToKeyboard(kb);
-                    }
-                    else
+                "Replace Tuning", SurgeStorage::CANCEL, [this](SurgeStorage::OkCancel okc) {
+                    if (okc == SurgeStorage::OK)
                     {
-                        storage.remapToConcertCKeyboard();
+                        try
+                        {
+                            if (storage.getPatch().patchTuning.scaleContents.size() > 1)
+                            {
+                                storage.retuneToScale(Tunings::parseSCLData(
+                                    storage.getPatch().patchTuning.scaleContents));
+                            }
+                            else
+                            {
+                                storage.retuneTo12TETScale();
+                            }
+                            if (storage.getPatch().patchTuning.mappingContents.size() > 1)
+                            {
+                                auto kb = Tunings::parseKBMData(
+                                    storage.getPatch().patchTuning.mappingContents);
+                                if (storage.getPatch().patchTuning.mappingName.size() > 1)
+                                    kb.name = storage.getPatch().patchTuning.mappingName;
+                                else
+                                    kb.name = storage.guessAtKBMName(kb);
+                                storage.remapToKeyboard(kb);
+                            }
+                            else
+                            {
+                                storage.remapToConcertCKeyboard();
+                            }
+                        }
+                        catch (Tunings::TuningError &e)
+                        {
+                            storage.reportError(e.what(), "Error Restoring Tuning");
+                            storage.retuneTo12TETScaleC261Mapping();
+                        }
                     }
-                }
-                catch (Tunings::TuningError &e)
-                {
-                    storage.reportError(e.what(), "Error Restoring Tuning");
-                    storage.retuneTo12TETScaleC261Mapping();
-                }
-            }
+                });
         }
     }
 
@@ -528,14 +529,21 @@ void SurgeSynthesizer::savePatch()
 
     if (fs::exists(filename))
     {
-        if (storage.okCancelProvider(
-                std::string("The patch '" + storage.getPatch().name + "' already exists in '" +
-                            storage.getPatch().category +
-                            "'. Are you sure you want to overwrite it?"),
-                std::string("Overwrite patch"), SurgeStorage::OK) == SurgeStorage::CANCEL)
-            return;
+        storage.okCancelProvider(std::string("The patch '" + storage.getPatch().name +
+                                             "' already exists in '" + storage.getPatch().category +
+                                             "'. Are you sure you want to overwrite it?"),
+                                 std::string("Overwrite patch"), SurgeStorage::OK,
+                                 [filename, this](SurgeStorage::OkCancel okc) {
+                                     if (okc == SurgeStorage::OK)
+                                     {
+                                         savePatchToPath(filename);
+                                     }
+                                 });
+    }
+    else
+    {
+        savePatchToPath(filename);
     }
-    savePatchToPath(filename);
 }
 
 void SurgeSynthesizer::savePatchToPath(fs::path filename)

diff --git a/src/gui/SurgeGUIEditor.cpp b/src/gui/SurgeGUIEditor.cpp
@@ -93,14 +93,15 @@ SurgeGUIEditor::SurgeGUIEditor(SurgeSynthEditor *jEd, SurgeSynthesizer *synth)
     assert(n_paramslots >= n_total_params);
     synth->storage.addErrorListener(this);
     synth->storage.okCancelProvider = [](const std::string &msg, const std::string &title,
-                                         SurgeStorage::OkCancel def) {
+                                         SurgeStorage::OkCancel def,
+                                         std::function<void(SurgeStorage::OkCancel)> callback) {
         // think about threading one day probably
+        auto cb = juce::ModalCallbackFunction::create([callback](int isOk) {
+            auto r = isOk ? SurgeStorage::OK : SurgeStorage::CANCEL;
+            callback(r);
+        });
         auto res = juce::AlertWindow::showOkCancelBox(juce::AlertWindow::InfoIcon, title, msg, "OK",
-                                                      "Cancel", nullptr, nullptr);
-
-        if (res)
-            return SurgeStorage::OK;
-        return SurgeStorage::CANCEL;
+                                                      "Cancel", nullptr, cb);
     };
 #ifdef INSTRUMENT_UI
     Surge::Debug::record("SurgeGUIEditor::SurgeGUIEditor");