plugin: preserve state when saving from editor

JoepVanlier · Dec 9, 2024 · 7a3be92 · 7a3be92
1 parent e7a9ed2
commit 7a3be92
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/plugin/editor.cpp b/plugin/editor.cpp
@@ -61,7 +61,7 @@ struct YsfxEditor::Impl {
     void updateInfo();
     void grabInfoAndUpdate();
     void chooseFileAndLoad();
-    void loadFile(const juce::File &file);
+    void loadFile(const juce::File &file, bool keepState);
     void popupRecentFiles();
     void popupRecentOpts();
     void popupPresets();
@@ -260,7 +260,7 @@ void YsfxEditor::filesDropped(const juce::StringArray &files, int x, int y)
         if (files.size() == 1) {
             juce::File file{files[0]};
             if (file.existsAsFile()) {
-                m_impl->loadFile(files[0]);
+                m_impl->loadFile(files[0], false);
             }   
         }
     }
@@ -486,7 +486,7 @@ void YsfxEditor::Impl::chooseFileAndLoad()
                     mustAskConfirmation,
                     [this, normalLoad, result]() {
                         if (normalLoad) saveScaling();
-                        loadFile(result);
+                        loadFile(result, false);
                     },
                     this->m_self
                 );
@@ -557,15 +557,15 @@ void YsfxEditor::Impl::loadScaling()
     }
 }
 
-void YsfxEditor::Impl::loadFile(const juce::File &file)
+void YsfxEditor::Impl::loadFile(const juce::File &file, bool keepState)
 {
     {
         juce::ScopedLock lock{m_pluginProperties->getLock()};
         m_pluginProperties->setValue("load_path", file.getParentDirectory().getFullPathName());
         m_pluginProperties->save();
     }
 
-    m_proc->loadJsfxFile(file.getFullPathName(), nullptr, true);
+    m_proc->loadJsfxFile(file.getFullPathName(), nullptr, true, keepState);
     relayoutUILater();
 
     juce::RecentlyOpenedFilesList recent = loadRecentFiles();
@@ -592,7 +592,7 @@ void YsfxEditor::Impl::popupRecentFiles()
                 ysfx_is_compiled(m_info->effect.get()),
                 [this, selectedFile]() {
                     saveScaling();
-                    loadFile(selectedFile);
+                    loadFile(selectedFile, false);
                 },
                 this->m_self
             );
@@ -952,7 +952,7 @@ void YsfxEditor::Impl::connectUI()
             ysfx_is_compiled(fx),
             [this, file]() {
                 resetScaling(file);
-                loadFile(file);
+                loadFile(file, false);
             },
             this->m_self
         );
@@ -973,8 +973,8 @@ void YsfxEditor::Impl::connectUI()
         }
     };
 
-    m_ideView->onFileSaved = [this](const juce::File &file) { loadFile(file); };
-    m_ideView->onReloadRequested = [this](const juce::File &file) { loadFile(file); };
+    m_ideView->onFileSaved = [this](const juce::File &file) { loadFile(file, true); };
+    m_ideView->onReloadRequested = [this](const juce::File &file) { loadFile(file, true); };
 
     m_infoTimer.reset(FunctionalTimer::create([this]() { grabInfoAndUpdate(); }));
     m_infoTimer->startTimer(100);

diff --git a/plugin/processor.cpp b/plugin/processor.cpp
@@ -91,7 +91,7 @@ struct YsfxProcessor::Impl : public juce::AudioProcessorListener {
     public:
         explicit SliderNotificationUpdater(Impl *impl) : m_impl{impl} {}
         void addSlidersToNotify(uint64_t mask, int group) { m_sliderMask[group].fetch_or(mask); }
-        void updateTouch(uint64_t mask, int group) { m_touchMask[group].exchange(mask); };
+        void updateTouch(uint64_t mask, int group) { m_touchMask[group].exchange(mask); }
 
     protected:
         void handleAsyncUpdate() override;
@@ -257,11 +257,22 @@ YsfxParameter *YsfxProcessor::getYsfxParameter(int sliderIndex)
     return static_cast<YsfxParameter *>(getParameters()[paramIndex]);
 }
 
-void YsfxProcessor::loadJsfxFile(const juce::String &filePath, ysfx_state_t *initialState, bool async)
+void YsfxProcessor::loadJsfxFile(const juce::String &filePath, ysfx_state_t *initialState, bool async, bool preserveState)
 {
     Impl::LoadRequest::Ptr loadRequest{new Impl::LoadRequest};
     loadRequest->filePath = filePath;
 
+    if (preserveState) {
+        jassert(!initialState);
+
+        {
+            AudioProcessorSuspender sus(*this);
+            sus.lockCallbacks();
+            ysfx_t *fx = m_impl->m_fx.get();
+            initialState = ysfx_save_state(fx);
+        }
+    }
+
     if (m_impl->m_failedLoad.load() == RetryState::retrying) {
         {
             const juce::ScopedLock sl(m_impl->m_loadLock);
@@ -666,10 +677,10 @@ void YsfxProcessor::setStateInformation(const void *data, int sizeInBytes)
         state.slider_count = (uint32_t)sliders.size();
         state.data = (uint8_t *)dataBlock.getData();
         state.data_size = dataBlock.getSize();
-        loadJsfxFile(path.getFullPathName(), &state, false);
+        loadJsfxFile(path.getFullPathName(), &state, false, false);
     }
     else {
-        loadJsfxFile(path.getFullPathName(), nullptr, false);
+        loadJsfxFile(path.getFullPathName(), nullptr, false, false);
     }
 }
 

diff --git a/plugin/processor.h b/plugin/processor.h
@@ -32,7 +32,7 @@ class YsfxProcessor : public juce::AudioProcessor {
     ~YsfxProcessor() override;
 
     YsfxParameter *getYsfxParameter(int sliderIndex);
-    void loadJsfxFile(const juce::String &filePath, ysfx_state_t *initialState, bool async);
+    void loadJsfxFile(const juce::String &filePath, ysfx_state_t *initialState, bool async, bool preserveState);
     void loadJsfxPreset(YsfxInfo::Ptr info, ysfx_bank_shared bank, uint32_t index, PresetLoadMode load, bool async);
     bool presetExists(const char *preset_name);
     void reloadBank();