Minor UX tweaks (#7958)

* Add disabled entries to MSEG Segment context menu - These show the segment's duration, value and control point info * Adjust name of step seq value edit menu entries * Small code cleanup for MSEGEditor * Add getValueDispPrecision() to SurgeStorage * Update all cases of checking HighPrecisionReadouts option consequently
surge-synthesizer · Jan 10, 2025 · 95ef2bb · 95ef2bb
1 parent 94cb2fa
commit 95ef2bb
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 135 deletions.
diff --git a/src/common/Parameter.cpp b/src/common/Parameter.cpp
@@ -2439,13 +2439,7 @@ void Parameter::get_display_of_modulation_depth(char *txt, float modulationDepth
 {
 #define ITXT_SIZE 1024
 
-    int detailedMode = false;
-
-    if (storage)
-    {
-        detailedMode =
-            Surge::Storage::getUserDefaultValue(storage, Surge::Storage::HighPrecisionReadouts, 0);
-    }
+    const bool detailedMode = Surge::Storage::getValueDispPrecision(storage);
 
     if (basicBlocksParamMetaData.has_value() && basicBlocksParamMetaData->supportsStringConversion)
     {
@@ -3286,8 +3280,7 @@ void Parameter::get_display_alt(char *txt, bool external, float ef) const
         }
     }
 
-    int detailedMode =
-        Surge::Storage::getUserDefaultValue(storage, Surge::Storage::HighPrecisionReadouts, 0);
+    const bool detailedMode = Surge::Storage::getValueDispPrecision(storage);
 
     txt[0] = 0;
     switch (ctrltype)
@@ -3454,13 +3447,7 @@ std::string Parameter::get_display(bool external, float ef) const
     float f;
     bool b;
 
-    int detailedMode = 0;
-
-    if (storage)
-    {
-        detailedMode =
-            Surge::Storage::getUserDefaultValue(storage, Surge::Storage::HighPrecisionReadouts, 0);
-    }
+    const bool detailedMode = Surge::Storage::getValueDispPrecision(storage);
 
     if (basicBlocksParamMetaData.has_value() && basicBlocksParamMetaData->supportsStringConversion)
     {
@@ -3591,7 +3578,7 @@ std::string Parameter::get_display(bool external, float ef) const
                 {
                     dval *= 1000.f;
                     u = "ms";
-                    dec = detailedMode ? 2 : 1;
+                    dec = detailedMode ? 3 : 1;
                 }
             }
 

diff --git a/src/common/SurgeStorage.cpp b/src/common/SurgeStorage.cpp
@@ -3243,6 +3243,39 @@ float SurgeStorage::remapKeyInMidiOnlyMode(float res)
     return res;
 }
 
+Surge::Storage::ScenesOutputData::ScenesOutputData()
+{
+    for (int i = 0; i < n_scenes; i++)
+    {
+        for (int j = 0; j < N_OUTPUTS; j++)
+        {
+            std::shared_ptr<float> block(new float[BLOCK_SIZE], [](float *p) { delete[] p; });
+            memset(block.get(), 0, BLOCK_SIZE * sizeof(float));
+            sceneData[i][j] = block;
+        }
+    }
+}
+const std::shared_ptr<float> &Surge::Storage::ScenesOutputData::getSceneData(int scene,
+                                                                             int channel) const
+{
+    assert(scene < n_scenes && scene >= 0);
+    assert(channel < N_OUTPUTS && channel >= 0);
+    return sceneData[scene][channel];
+}
+bool Surge::Storage::ScenesOutputData::thereAreClients(int scene) const
+{
+    return std::any_of(std::begin(sceneData[scene]), std::end(sceneData[scene]),
+                       [](const auto &channel) { return channel.use_count() > 1; });
+}
+void Surge::Storage::ScenesOutputData::provideSceneData(int scene, int channel, float *data)
+{
+    if (scene < n_scenes && scene >= 0 && channel < N_OUTPUTS && channel >= 0 &&
+        sceneData[scene][channel].use_count() > 1) // we don't provide data if there are no clients
+    {
+        memcpy(sceneData[scene][channel].get(), data, BLOCK_SIZE * sizeof(float));
+    }
+}
+
 namespace Surge
 {
 namespace Storage
@@ -3465,37 +3498,14 @@ std::string base64_decode(std::string const &encoded_string)
     return ret;
 }
 
-Surge::Storage::ScenesOutputData::ScenesOutputData()
+bool getValueDispPrecision(SurgeStorage *storage)
 {
-    for (int i = 0; i < n_scenes; i++)
+    if (storage)
     {
-        for (int j = 0; j < N_OUTPUTS; j++)
-        {
-            std::shared_ptr<float> block(new float[BLOCK_SIZE], [](float *p) { delete[] p; });
-            memset(block.get(), 0, BLOCK_SIZE * sizeof(float));
-            sceneData[i][j] = block;
-        }
-    }
-}
-const std::shared_ptr<float> &Surge::Storage::ScenesOutputData::getSceneData(int scene,
-                                                                             int channel) const
-{
-    assert(scene < n_scenes && scene >= 0);
-    assert(channel < N_OUTPUTS && channel >= 0);
-    return sceneData[scene][channel];
-}
-bool Surge::Storage::ScenesOutputData::thereAreClients(int scene) const
-{
-    return std::any_of(std::begin(sceneData[scene]), std::end(sceneData[scene]),
-                       [](const auto &channel) { return channel.use_count() > 1; });
-}
-void Surge::Storage::ScenesOutputData::provideSceneData(int scene, int channel, float *data)
-{
-    if (scene < n_scenes && scene >= 0 && channel < N_OUTPUTS && channel >= 0 &&
-        sceneData[scene][channel].use_count() > 1) // we don't provide data if there are no clients
-    {
-        memcpy(sceneData[scene][channel].get(), data, BLOCK_SIZE * sizeof(float));
+        return getUserDefaultValue(storage, HighPrecisionReadouts, false);
     }
+
+    return false;
 }
 
 } // namespace Storage

diff --git a/src/common/SurgeStorage.h b/src/common/SurgeStorage.h
@@ -1819,6 +1819,8 @@ bool is_base64(unsigned char c);
 std::string base64_encode(unsigned char const *bytes_to_encode, unsigned int in_len);
 std::string base64_decode(std::string const &encoded_string);
 
+bool getValueDispPrecision(SurgeStorage *storage);
+
 } // namespace Storage
 } // namespace Surge
 

diff --git a/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp b/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp
@@ -282,13 +282,8 @@ void AirWindowsEffect::process(float *dataL, float *dataR)
 void AirWindowsEffect::setupSubFX(int sfx, bool useStreamedValues)
 {
     const auto &r = fxreg[sfx];
-
-    bool detailedMode = false;
-    if (storage)
-        detailedMode =
-            Surge::Storage::getUserDefaultValue(storage, Surge::Storage::HighPrecisionReadouts, 0);
-
-    int dp = (detailedMode ? 6 : 2);
+    const bool detailedMode = Surge::Storage::getValueDispPrecision(storage);
+    int dp = detailedMode ? 6 : 2;
 
     airwin = r.create(r.id, storage->dsamplerate, dp); // FIXME
     airwin->storage = storage;

diff --git a/src/common/dsp/effects/airwindows/AirWindowsEffect.h b/src/common/dsp/effects/airwindows/AirWindowsEffect.h
@@ -134,14 +134,8 @@ class alignas(16) AirWindowsEffect : public Effect
                         fx->airwin->setParameter(idx, value);
                     }
 
-                    if (fx->storage)
-                    {
-                        auto detailedMode = Surge::Storage::getUserDefaultValue(
-                            fx->storage, Surge::Storage::HighPrecisionReadouts, 0);
-
-                        fx->airwin->displayPrecision = (detailedMode ? 6 : 2);
-                    }
-
+                    fx->airwin->displayPrecision =
+                        Surge::Storage::getValueDispPrecision(fx->storage) ? 6 : 2;
                     fx->airwin->getParameterLabel(idx, lab);
                     fx->airwin->getParameterDisplay(idx, dis, value, true);
                 }

diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -3435,8 +3435,7 @@ void SurgeGUIEditor::promptForUserValueEntry(Parameter *p, juce::Component *c, i
     }
     else
     {
-        int detailedMode = Surge::Storage::getUserDefaultValue(
-            &(this->synth->storage), Surge::Storage::HighPrecisionReadouts, 0);
+        const bool detailedMode = Surge::Storage::getValueDispPrecision(&(this->synth->storage));
         auto cms = ((ControllerModulationSource *)synth->storage.getPatch()
                         .scene[current_scene]
                         .modsources[ms]);

diff --git a/src/surge-xt/gui/SurgeGUIEditorMenuStructures.cpp b/src/surge-xt/gui/SurgeGUIEditorMenuStructures.cpp
@@ -1140,14 +1140,13 @@ juce::PopupMenu SurgeGUIEditor::makeValueDisplaysMenu(const juce::Point<int> &wh
 {
     auto dispDefMenu = juce::PopupMenu();
 
-    bool precReadout = Surge::Storage::getUserDefaultValue(
-        &(this->synth->storage), Surge::Storage::HighPrecisionReadouts, false);
+    const bool detailedMode = Surge::Storage::getValueDispPrecision(&(this->synth->storage));
 
-    dispDefMenu.addItem(Surge::GUI::toOSCase("High Precision Value Readouts"), true, precReadout,
-                        [this, precReadout]() {
+    dispDefMenu.addItem(Surge::GUI::toOSCase("High Precision Value Readouts"), true, detailedMode,
+                        [this, detailedMode]() {
                             Surge::Storage::updateUserDefaultValue(
                                 &(this->synth->storage), Surge::Storage::HighPrecisionReadouts,
-                                !precReadout);
+                                !detailedMode);
                         });
 
     // modulation value readout shows bounds

diff --git a/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp b/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
@@ -936,8 +936,8 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
 
             bool cancellearn = false;
             int ccid = 0;
-            int detailedMode = Surge::Storage::getUserDefaultValue(
-                &(this->synth->storage), Surge::Storage::HighPrecisionReadouts, 0);
+            const bool detailedMode =
+                Surge::Storage::getValueDispPrecision(&(this->synth->storage));
 
             // should start at 0, but it started at 1 before
             // there might be a reason but I don't remember why