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/NodeImpl.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/NodeImpl.hpp') diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 995450f3..f9509e49 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -20,7 +20,6 @@ #include #include -#include "ingen/Node.hpp" #include "raul/Array.hpp" #include "raul/AtomicInt.hpp" #include "raul/Semaphore.hpp" @@ -39,7 +38,6 @@ class Maid; namespace Ingen { class Plugin; -class Port; namespace Server { @@ -59,7 +57,7 @@ class ProcessContext; * * \ingroup engine */ -class NodeImpl : public GraphObjectImpl, virtual public Node +class NodeImpl : public GraphObjectImpl { public: NodeImpl(PluginImpl* plugin, @@ -70,6 +68,8 @@ public: virtual ~NodeImpl(); + virtual GraphType graph_type() const { return NODE; } + /** Activate this Node. * * This function must be called in a non-realtime thread before it is @@ -142,8 +142,8 @@ public: BufferRef buf, SampleCount offset); - virtual Port* port(uint32_t index) const; - virtual PortImpl* port_impl(uint32_t index) const { return (*_ports)[index]; } + virtual GraphObject* port(uint32_t index) const; + virtual PortImpl* port_impl(uint32_t index) const { return (*_ports)[index]; } /** Nodes that are connected to this Node's inputs. */ std::list& providers() { return _providers; } -- cgit v1.2.1