From fbd0184b77f4bcd7ec22642b5f75f2188b870f72 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 14 Mar 2018 23:58:27 -0400 Subject: Remove RunContext dependency from CompiledGraph --- src/server/CompiledGraph.cpp | 6 ------ src/server/CompiledGraph.hpp | 3 +-- src/server/GraphImpl.cpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 8b996c10..449e7aa0 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -204,12 +204,6 @@ CompiledGraph::compile_block(BlockImpl* n, } } -void -CompiledGraph::run(RunContext& context) -{ - _master->run(context); -} - void CompiledGraph::dump(const std::string& name) const { diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp index 9f4de68c..3af43722 100644 --- a/src/server/CompiledGraph.hpp +++ b/src/server/CompiledGraph.hpp @@ -32,7 +32,6 @@ namespace Server { class BlockImpl; class GraphImpl; -class RunContext; /** A graph ``compiled'' into a quickly executable form. * @@ -46,7 +45,7 @@ class CompiledGraph : public Raul::Maid::Disposable public: static MPtr compile(Raul::Maid& maid, GraphImpl& graph); - void run(RunContext& context); + Task& master() { return *_master; } private: friend class Raul::Maid; ///< Allow make_managed to construct diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index f9c4cb54..dc928179 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -232,7 +232,7 @@ void GraphImpl::run(RunContext& context) { if (_compiled_graph) { - _compiled_graph->run(context); + _compiled_graph->master().run(context); } } -- cgit v1.2.1