Update node MIDI program UI when PGC processed.

Closes #124
kushview · Nov 17, 2019 · 64ed93f · 64ed93f
1 parent 4f42544
commit 64ed93f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 44 deletions.
diff --git a/src/engine/GraphNode.cpp b/src/engine/GraphNode.cpp
@@ -408,6 +408,9 @@ File GraphNode::getMidiProgramFile (int program) const
 
 void GraphNode::saveMidiProgram()
 {
+    if (useGlobalMidiPrograms())
+        return; // don't save global programs here.
+
     int progamNumber = midiProgram.get();
     if (! isPositiveAndBelow (progamNumber, 128))
         return;
@@ -519,14 +522,22 @@ void GraphNode::setMidiProgram (const int program)
 
 void GraphNode::setMidiProgramName (const int program, const String& name) 
 {
+    if (useGlobalMidiPrograms())
+        return; // names not supported with global programs yet.
+
     if (auto* pr = getMidiProgram (program))
-    {
         pr->name = name;
-    }
 }
 
 String GraphNode::getMidiProgramName (const int program) const
 {
+    if (useGlobalMidiPrograms())
+    {
+        String name ("Global ");
+        name << (program + 1);
+        return name;
+    }
+
     if (auto* pr = getMidiProgram (program))
         return pr->name;
     return {};

diff --git a/src/gui/properties/NodeProperties.cpp b/src/gui/properties/NodeProperties.cpp
@@ -140,14 +140,15 @@ class NodeMidiProgramPropertyComponent : public PropertyComponent
         String programName;
         if (GraphNodePtr object = node.getGraphNode())
         {
+            const bool global = object->useGlobalMidiPrograms();
             // use the object because there isn't a notifaction directly back to node model
             // in all cases
             const auto programNumber = object->getMidiProgram();
             program.slider.setValue (1 + object->getMidiProgram(), dontSendNotification);
             if (isPositiveAndNotGreaterThan (roundToInt (program.slider.getValue()), 128))
             {
                 programName = node.getMidiProgramName (programNumber);
-                program.name.setEnabled (enabled);
+                program.name.setEnabled (global ? false : enabled);
                 program.loadButton.setEnabled (enabled);
                 program.saveButton.setEnabled (enabled);
                 program.trashButton.setEnabled (enabled);

diff --git a/src/gui/views/NodeMidiContentView.cpp b/src/gui/views/NodeMidiContentView.cpp
@@ -76,10 +76,10 @@ void NodeMidiContentView::stabilizeContent()
 
         if (GraphNodePtr ptr = node.getGraphNode())
         {
-            #if defined (EL_PRO) || defined (EL_SOLO)
-            ptr->midiProgramChanged.connect (
+           #if defined (EL_PRO) || defined (EL_SOLO)
+            midiProgramChangedConnection = ptr->midiProgramChanged.connect (
                 std::bind (&NodeMidiContentView::updateMidiProgram, this));
-            #endif
+           #endif
         }
     }
     else
@@ -92,51 +92,16 @@ void NodeMidiContentView::stabilizeContent()
 
 void NodeMidiContentView::updateProperties()
 {
-    #if EL_NODE_MIDI_CONTENT_VIEW_PROPS
+   #if EL_NODE_MIDI_CONTENT_VIEW_PROPS
     props.clear();
     props.addProperties (NodeProperties (node, false, true));
     resized();
-    #endif
+   #endif
 }
 
 void NodeMidiContentView::updateMidiProgram()
 {
-   #if 0
-    const bool enabled = node.areMidiProgramsEnabled();
-    String programName;
-    if (GraphNodePtr object = node.getGraphNode())
-    {
-        // use the object because there isn't a notifaction directly back to node model
-        // in all cases
-        const auto programNumber = object->getMidiProgram();
-        midiProgram.slider.setValue (1 + object->getMidiProgram(), dontSendNotification);
-        if (isPositiveAndNotGreaterThan (roundToInt (midiProgram.slider.getValue()), 128))
-        {
-            programName = node.getMidiProgramName (programNumber);
-            midiProgram.name.setEnabled (enabled);
-            midiProgram.loadButton.setEnabled (enabled);
-            midiProgram.saveButton.setEnabled (enabled);
-            midiProgram.trashButton.setEnabled (enabled);
-            midiProgram.powerButton.setToggleState (enabled, dontSendNotification);
-        }
-        else
-        {
-            midiProgram.name.setEnabled (false);
-            midiProgram.loadButton.setEnabled (false);
-            midiProgram.saveButton.setEnabled (false);
-            midiProgram.trashButton.setEnabled (false);
-            midiProgram.powerButton.setToggleState (false, dontSendNotification);
-        }
-    }
-
-    midiProgram.name.setText (programName.isNotEmpty() ? 
-        programName : EL_PROGRAM_NAME_PLACEHOLDER, dontSendNotification);
-    midiProgram.powerButton.setToggleState (node.areMidiProgramsEnabled(), dontSendNotification);
-    midiProgram.globalButton.setToggleState (node.useGlobalMidiPrograms(), dontSendNotification);
-    midiProgram.globalButton.setEnabled (enabled);
-    midiProgram.slider.updateText();
-    midiProgram.slider.setEnabled (enabled);
-   #endif
+    updateProperties();
 }
 
 }