From 0e1bf6ddfc77866ff6477a3f394c030c2a5e1b39 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 30 Jul 2012 23:00:13 +0000 Subject: Eliminate pure virtual base classes Patch, Node, and Port, and the virtual inheritance they imposed. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4576 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/PatchImpl.hpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/server/PatchImpl.hpp') diff --git a/src/server/PatchImpl.hpp b/src/server/PatchImpl.hpp index 0a8d5547..1d8cef08 100644 --- a/src/server/PatchImpl.hpp +++ b/src/server/PatchImpl.hpp @@ -21,7 +21,6 @@ #include #include -#include "ingen/Patch.hpp" #include "raul/List.hpp" #include "CompiledPatch.hpp" @@ -50,7 +49,7 @@ class ProcessContext; * * \ingroup engine */ -class PatchImpl : public NodeImpl, public Patch +class PatchImpl : public NodeImpl { public: PatchImpl(Engine& engine, @@ -62,6 +61,8 @@ public: virtual ~PatchImpl(); + virtual GraphType graph_type() const { return PATCH; } + void activate(BufferFactory& bufs); void deactivate(); @@ -100,11 +101,8 @@ public: void add_node(Nodes::Node* tn); Nodes::Node* remove_node(const Raul::Symbol& symbol); - Nodes& nodes() { return _nodes; } - Edges& edges() { return _edges; } - + Nodes& nodes() { return _nodes; } const Nodes& nodes() const { return _nodes; } - const Edges& edges() const { return _edges; } uint32_t num_ports_non_rt() const; @@ -165,7 +163,6 @@ private: uint32_t _poly_pre; ///< Pre-process thread only uint32_t _poly_process; ///< Process thread only CompiledPatch* _compiled_patch; ///< Process thread only - Edges _edges; ///< Pre-process thread only Ports _inputs; ///< Pre-process thread only Ports _outputs; ///< Pre-process thread only Nodes _nodes; ///< Pre-process thread only -- cgit v1.2.1