Some naming rationalization and audioenigne.cpp cleanup

include/element/audioengine.hpp

@@ -50,9 +50,8 @@ class AudioEngine final : public juce::ReferenceCountedObject {
     bool addGraph (RootGraph* graph);
     bool removeGraph (RootGraph* graph);
 
-    void setCurrentGraph (const int index) { setActiveGraph (index); }
-    void setActiveGraph (const int index);
-    int getActiveGraph() const;
+    void setActiveGraphIndex (const int index);
+    int getActiveGraphIndex() const;
 
     RootGraph* getGraph (const int index);
 

include/element/session.hpp

@@ -44,7 +44,6 @@ class Session : public Model,
 
     inline int getNumGraphs() const { return objectData.getChildWithName (tags::graphs).getNumChildren(); }
     inline Node getGraph (const int index) const { return Node (getGraphValueTree (index), false); }
-    Node getCurrentGraph() const { return getActiveGraph(); }
     Node getActiveGraph() const;
     int getActiveGraphIndex() const;
 

src/services.cpp

@@ -182,7 +182,7 @@ void Services::run()
     if (auto* gui = find<GuiService>())
     {
         gui->stabilizeContent();
-        const Node graph (session->getCurrentGraph());
+        const Node graph (session->getActiveGraph());
         auto* const window = gui->getMainWindow();
 
         // don't show plugin windows on load if the UI is hidden

src/services/engineservice.cpp

@@ -228,7 +228,7 @@ class EngineService::RootGraphs
         auto engine = owner.context().audio();
         if (! engine)
             return 0;
-        const int currentIndex = engine->getActiveGraph();
+        const int currentIndex = engine->getActiveGraphIndex();
         if (currentIndex >= 0)
             for (auto* h : graphs)
                 if (auto* root = h->getRootGraph())
@@ -313,7 +313,7 @@ EngineService::~EngineService()
 void EngineService::addConnection (const uint32 s, const uint32 sp, const uint32 d, const uint32 dp)
 {
     if (auto session = context().session())
-        if (auto* h = graphs->findFor (session->getCurrentGraph()))
+        if (auto* h = graphs->findFor (session->getActiveGraph()))
             if (auto* c = h->getController())
                 c->addConnection (s, sp, d, dp);
 }
@@ -403,7 +403,7 @@ void EngineService::duplicateGraph()
     auto& world = context();
     auto engine = world.audio();
     auto session = world.session();
-    const Node current (session->getCurrentGraph());
+    const Node current (session->getActiveGraph());
     duplicateGraph (current);
 }
 
@@ -451,7 +451,7 @@ void EngineService::removeGraph (int index)
                     index = session->getNumGraphs() - 1;
 
                 sgraphs.setProperty (tags::active, index, 0);
-                const Node nextGraph = session->getCurrentGraph();
+                const Node nextGraph = session->getActiveGraph();
 
                 if (nextGraph.isRootGraph())
                 {
@@ -846,7 +846,7 @@ void EngineService::setRootNode (const Node& newRootNode)
             r->setNodeModel (newRootNode);
         }
 
-        engine->setCurrentGraph (index);
+        engine->setActiveGraphIndex (index);
     }
     else
     {

src/services/guiservice.cpp

@@ -247,7 +247,7 @@ void GuiService::ForegroundCheck::timerCallback()
     if (foreground)
     {
         if (session)
-            ui.showPluginWindowsFor (session->getCurrentGraph(), true, false);
+            ui.showPluginWindowsFor (session->getActiveGraph(), true, false);
         ui.getMainWindow()->toFront (true);
     }
     else if (! foreground)
@@ -1084,7 +1084,7 @@ bool GuiService::perform (const InvocationInfo& info)
         }
         case Commands::exportGraph: {
             auto session = context().session();
-            auto node = session->getCurrentGraph();
+            auto node = session->getActiveGraph();
             node.savePluginState();
 
             if (! impl->lastExportedGraph.isDirectory())

src/ui/connectiongrid.cpp

@@ -1031,6 +1031,6 @@ void ConnectionGrid::itemDropped (const SourceDetails& sd)
 void ConnectionGrid::didBecomeActive()
 {
     auto session = ViewHelpers::findContentComponent (this)->session();
-    setNode (session->getCurrentGraph());
+    setNode (session->getActiveGraph());
 }
 } // namespace element

src/ui/content.cpp

@@ -444,7 +444,7 @@ Content::Content (Context& ctx)
     toolBarVisible = true;
     toolBarSize = 32;
 
-    const Node node (context().session()->getCurrentGraph());
+    const Node node (context().session()->getActiveGraph());
     setCurrentNode (node);
 
     resized();

src/ui/grapheditorview.cpp

@@ -88,7 +88,7 @@ void GraphEditorView::stabilizeContent()
     if (! getGraph().isValid() || ! getGraph().isGraph())
     {
         if (auto session = ViewHelpers::getSession (this))
-            setNode (session->getCurrentGraph());
+            setNode (session->getActiveGraph());
     }
 
     const auto g = getGraph();

src/ui/graphsettingsview.cpp

@@ -545,7 +545,7 @@ void GraphSettingsView::stabilizeContent()
         auto& ui = *srvc.find<UI>();
 
         if (! props->node().isValid())
-            props->setNode (world->session()->getCurrentGraph());
+            props->setNode (world->session()->getActiveGraph());
 
         if (! props->node().isValid())
             props->setNode (detail::findGraph (ui.getSelectedNode()));

src/ui/mainwindow.cpp

@@ -100,7 +100,7 @@ void MainWindow::nameChangedSession()
     }
 
     auto sessionName = session->getName().trim();
-    auto graphName = session->getCurrentGraph().getName().trim();
+    auto graphName = session->getActiveGraph().getName().trim();
     if (sessionName.isEmpty())
     {
         const auto file = controller->getSessionFile();

src/ui/sessiontreepanel.cpp

@@ -577,7 +577,7 @@ class SessionRootGraphTreeItem : public SessionGraphTreeItem
 
     void activateGraph()
     {
-        const bool nodeIsCurrent = node == session()->getCurrentGraph();
+        const bool nodeIsCurrent = node == session()->getActiveGraph();
         if (nodeIsCurrent)
             return;