save/restore main volume

mosynthkey · Dec 31, 2023 · 6f8d400 · 6f8d400
1 parent 224f3d2
commit 6f8d400
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Source/MelissaDataSource.cpp b/Source/MelissaDataSource.cpp
@@ -102,6 +102,7 @@ void MelissaDataSource::loadSettingsFile(const File& file)
     {
         auto p = settings["previous"].getDynamicObject();
         if (p->hasProperty("file"))   previous_.filePath_    = p->getProperty("file");
+        if (p->hasProperty("main_volume")) previous_.mainVolume_ = p->getProperty("main_volume");
         if (p->hasProperty("pitch"))  previous_.pitch_       = p->getProperty("pitch");
 
         if (p->hasProperty("a"))      previous_.aRatio_      = p->getProperty("a");
@@ -296,6 +297,7 @@ void MelissaDataSource::saveSettingsFile()
 
     auto previous = new DynamicObject();
     previous->setProperty("file",   currentSongFilePath_);
+    previous->setProperty("main_volume", model_->getMainVolume());
     previous->setProperty("pitch",  model_->getPitch());
     previous->setProperty("a",      model_->getLoopAPosRatio());
     previous->setProperty("b",      model_->getLoopBPosRatio());
@@ -707,6 +709,7 @@ void MelissaDataSource::restorePreviousState()
 #endif
 
     loadFileAsync(file, [&]() {
+        model_->setMainVolume(previous_.mainVolume_);
         model_->setPitch(previous_.pitch_);
         model_->setLoopPosRatio(previous_.aRatio_, previous_.bRatio_);
         model_->setOutputMode(previous_.outputMode_);

diff --git a/Source/MelissaDataSource.h b/Source/MelissaDataSource.h
@@ -74,6 +74,8 @@ class MelissaDataSource : public juce::AsyncUpdater
     struct Previous
     {
         juce::String filePath_;
+
+        float mainVolume_;
         float pitch_;
 
         float aRatio_;
@@ -117,7 +119,7 @@ class MelissaDataSource : public juce::AsyncUpdater
         UIState uiState_;
 
         Previous() :
-        filePath_(""), pitch_(0.f),
+        filePath_(""), mainVolume_(1.f), pitch_(0.f),
         aRatio_(0.f), bRatio_(1.f),
         outputMode_(kOutputMode_LR), musicVolume_(1.f), metronomeVolume_(1.f), volumeBalance_(0.5f),
         /* metronomeSw_(false), */ bpm_(kBpmShouldMeasure), accent_(4), beatPositionMSec_(0.f),