From b1198f0842e6e4d6b1c01f07d91b42ef4a212788 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 12 Feb 2017 15:04:20 +0100 Subject: Use smart pointers to handle real-time memory disposal --- src/server/events/CreateGraph.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/server/events/CreateGraph.cpp') diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index a59aadc6..7ebaeedc 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -42,7 +42,6 @@ CreateGraph::CreateGraph(Engine& engine, , _properties(properties) , _graph(NULL) , _parent(NULL) - , _compiled_graph(NULL) {} CreateGraph::~CreateGraph() @@ -50,8 +49,6 @@ CreateGraph::~CreateGraph() for (Event* ev : _child_events) { delete ev; } - - delete _compiled_graph; } void @@ -173,9 +170,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) if (_parent->enabled()) { _graph->enable(); } - if (ctx.must_compile(_parent)) { - _compiled_graph = CompiledGraph::compile(_parent); - } + _compiled_graph = ctx.maybe_compile(*_engine.maid(), *_parent); } _graph->activate(*_engine.buffer_factory()); @@ -201,7 +196,7 @@ CreateGraph::execute(RunContext& context) { if (_graph) { if (_parent && _compiled_graph) { - _compiled_graph = _parent->swap_compiled_graph(_compiled_graph); + _parent->set_compiled_graph(std::move(_compiled_graph)); } for (Event* ev : _child_events) { -- cgit v1.2.1