hookup group poly checkpoint

surge-synthesizer · Oct 24, 2024 · 1b19165 · 1b19165
1 parent 3603616
commit 1b19165
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 3 deletions.
diff --git a/src-ui/app/SCXTEditorDataCache.h b/src-ui/app/SCXTEditorDataCache.h
@@ -30,6 +30,8 @@
 
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
+#include <functional>
 
 #include "engine/bus.h"
 #include "engine/part.h"
@@ -64,9 +66,19 @@ struct SCXTEditorDataCache
     void fireSubscription(void *el, sst::jucegui::data::Continuous *);
     void fireSubscription(void *el, sst::jucegui::data::Discrete *);
 
+    void addNotificationCallback(void *el, std::function<void()>);
+    template <typename P> void fireAllNotificationsFor(const P &p)
+    {
+        auto st = &p;
+        auto end = &p + sizeof(P);
+        fireAllNotificationsBetween((void *)st, (void *)end);
+    }
+
   private:
+    void fireAllNotificationsBetween(void *st, void *end);
     std::unordered_map<void *, std::unordered_set<sst::jucegui::data::Continuous *>> csubs;
     std::unordered_map<void *, std::unordered_set<sst::jucegui::data::Discrete *>> dsubs;
+    std::unordered_map<void *, std::vector<std::function<void()>>> fsubs;
 
     struct CListener : sst::jucegui::data::Continuous::DataListener
     {

diff --git a/src-ui/app/edit-screen/components/GroupSettingsCard.cpp b/src-ui/app/edit-screen/components/GroupSettingsCard.cpp
@@ -36,6 +36,11 @@ GroupSettingsCard::GroupSettingsCard(SCXTEditor *e)
     : HasEditor(e), info(e->editorDataCache.groupOutputInfo)
 {
     using fac = connectors::SingleValueFactory<attachment_t, floatMsg_t>;
+    editor->editorDataCache.addNotificationCallback(&info,
+                                                    [w = juce::Component::SafePointer(this)]() {
+                                                        if (w)
+                                                            w->rebuildFromInfo();
+                                                    });
 
     auto mkg = [this](auto gl) {
         auto res = std::make_unique<jcmp::GlyphPainter>(gl);
@@ -61,7 +66,11 @@ GroupSettingsCard::GroupSettingsCard(SCXTEditor *e)
     outputGlyph = mkg(jcmp::GlyphPainter::GlyphType::SPEAKER);
     outputMenu = mkm("PART", "Output");
     polyGlygh = mkg(jcmp::GlyphPainter::GlyphType::POLYPHONY);
-    polyMenu = mkm("PART", "Polyphony");
+    polyMenu = std::make_unique<jcmp::TextPushButton>();
+    polyMenu->setLabel("PART");
+    polyMenu->setOnCallback([w = juce::Component::SafePointer(this)]() { SCLOG("POLY MENU"); });
+    addAndMakeVisible(*polyMenu);
+
     prioGlyph = mkg(jcmp::GlyphPainter::GlyphType::NOTE_PRIORITY);
     prioMenu = mkm("LAST", "Priority");
     glideGlpyh = mkg(jcmp::GlyphPainter::GlyphType::CURVE);
@@ -123,4 +132,6 @@ void GroupSettingsCard::resized()
     ospair(tuneGlyph, tuneDrag);
 }
 
+void GroupSettingsCard::rebuildFromInfo() { SCLOG("Rebuild from Info"); }
+
 } // namespace scxt::ui::app::edit_screen
diff --git a/src-ui/app/edit-screen/components/GroupSettingsCard.h b/src-ui/app/edit-screen/components/GroupSettingsCard.h
@@ -34,6 +34,7 @@
 #include "sst/jucegui/components/DraggableTextEditableValue.h"
 #include "sst/jucegui/components/Label.h"
 #include "sst/jucegui/components/GlyphButton.h"
+#include "sst/jucegui/components/TextPushButton.h"
 
 #include "messaging/messaging.h"
 #include "connectors/PayloadDataAttachment.h"
@@ -47,12 +48,14 @@ struct GroupSettingsCard : juce::Component, HasEditor
     GroupSettingsCard(SCXTEditor *e);
     void paint(juce::Graphics &g) override;
     void resized() override;
+    void rebuildFromInfo();
 
     std::unique_ptr<sst::jucegui::components::GlyphPainter> midiGlyph, outputGlyph, polyGlygh,
         prioGlyph, glideGlpyh, volGlyph, panGlyph, tuneGlyph;
     std::unique_ptr<sst::jucegui::components::Label> pbLabel, SRCLabel;
-    std::unique_ptr<sst::jucegui::components::MenuButton> midiMenu, outputMenu, polyMenu, prioMenu,
-        glideMenu, srcMenu;
+    std::unique_ptr<sst::jucegui::components::TextPushButton> polyMenu;
+    std::unique_ptr<sst::jucegui::components::MenuButton> midiMenu, outputMenu, prioMenu, glideMenu,
+        srcMenu;
     std::unique_ptr<sst::jucegui::components::DraggableTextEditableValue> pbDnVal, pbUpDrag,
         glideDrag, volDrag, panDrag, tuneDrag;
 

diff --git a/src-ui/app/editor-impl/SCXTEditorDataCache.cpp b/src-ui/app/editor-impl/SCXTEditorDataCache.cpp
@@ -92,4 +92,45 @@ void SCXTEditorDataCache::DListener::sourceVanished(sst::jucegui::data::Discrete
     }
 }
 
+void SCXTEditorDataCache::addNotificationCallback(void *el, std::function<void()> f)
+{
+    fsubs[el].push_back(f);
+}
+
+void SCXTEditorDataCache::fireAllNotificationsBetween(void *st, void *end)
+{
+    for (auto &[da, ds] : fsubs)
+    {
+        if (da >= st && da <= end)
+        {
+            for (auto &d : ds)
+            {
+                d();
+            }
+        }
+    }
+
+    for (auto &[da, ds] : dsubs)
+    {
+        if (da >= st && da <= end)
+        {
+            for (auto &d : ds)
+            {
+                d->setValueFromModel(*((int *)da));
+            }
+        }
+    }
+
+    for (auto &[da, ds] : csubs)
+    {
+        if (da >= st && da <= end)
+        {
+            for (auto &d : ds)
+            {
+                d->setValueFromModel(*((float *)da));
+            }
+        }
+    }
+}
+
 } // namespace scxt::ui::app
diff --git a/src-ui/app/editor-impl/SCXTEditorResponseHandlers.cpp b/src-ui/app/editor-impl/SCXTEditorResponseHandlers.cpp
@@ -204,6 +204,7 @@ void SCXTEditor::onZoneOutputInfoUpdated(const scxt::messaging::client::zoneOutp
 {
     auto [active, inf] = p;
     editorDataCache.zoneOutputInfo = inf;
+    editorDataCache.fireAllNotificationsFor(editorDataCache.zoneOutputInfo);
     editScreen->getZoneElements()->outPane->setActive(active);
     if (active)
     {
@@ -215,6 +216,7 @@ void SCXTEditor::onGroupOutputInfoUpdated(const scxt::messaging::client::groupOu
 {
     auto [active, inf] = p;
     editorDataCache.groupOutputInfo = inf;
+    editorDataCache.fireAllNotificationsFor(editorDataCache.groupOutputInfo);
     editScreen->getGroupElements()->outPane->setActive(active);
     if (active)
     {