From e185c69f0195b2e68d8019418638395d2b2d00b0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 15 Jan 2009 17:41:11 +0000
Subject: Add -Woverloaded-virtual to --strict flags and fix associated
 problems (notably LV2 message extension).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1920 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/PatchModel.cpp     | 2 +-
 src/client/PatchModel.hpp     | 5 ++---
 src/engine/LV2Node.hpp        | 2 +-
 src/engine/MessageContext.cpp | 4 ++--
 src/engine/NodeBase.hpp       | 2 +-
 src/engine/NodeImpl.hpp       | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index b79c8edd..c27ff718 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -168,7 +168,7 @@ PatchModel::enabled() const
 }
 	
 void
-PatchModel::set(const string& key, const Atom& value)
+PatchModel::set_property(const std::string& key, const Atom& value)
 {
 	ResourceImpl::set_property(key, value);
 	if (key == "ingen:polyphony")
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 4e5890ef..35b11e15 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -19,7 +19,6 @@
 #define PATCHMODEL_H
 
 #include <cassert>
-#include <list>
 #include <string>
 #include <sigc++/sigc++.h>
 #include "raul/SharedPtr.hpp"
@@ -28,7 +27,7 @@
 
 #include "ConnectionModel.hpp"
 
-using std::list; using std::string;
+using std::string;
 
 namespace Ingen {
 namespace Client {
@@ -64,7 +63,7 @@ public:
 		signal_editable.emit(e);
 	} }
 	
-	virtual void set(const string& key, const Atom& value);
+	virtual void set_property(const string& key, const Atom& value);
 
 	// Signals
 	sigc::signal<void, SharedPtr<NodeModel> >       signal_new_node; 
diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp
index 7f703117..0dfdafb5 100644
--- a/src/engine/LV2Node.hpp
+++ b/src/engine/LV2Node.hpp
@@ -53,7 +53,7 @@ public:
 	void activate();
 	void deactivate();
 	
-	void message_process(MessageContext& context, uint32_t* inputs, uint32_t* outputs);
+	void message_process(MessageContext& context, uint32_t* ins, uint32_t* outs);
 	
 	void process(ProcessContext& context);
 	
diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp
index 010d7067..778804b3 100644
--- a/src/engine/MessageContext.cpp
+++ b/src/engine/MessageContext.cpp
@@ -24,8 +24,8 @@ namespace Ingen {
 void
 MessageContext::run(NodeImpl* node)
 {
-	uint32_t outputs;
-	node->message_process(*this, &outputs);
+	uint32_t inputs, outputs;
+	node->message_process(*this, &inputs, &outputs);
 
 	// Don't care what the plugin output, yet...
 }
diff --git a/src/engine/NodeBase.hpp b/src/engine/NodeBase.hpp
index a20ebbb4..3efe8ebc 100644
--- a/src/engine/NodeBase.hpp
+++ b/src/engine/NodeBase.hpp
@@ -74,7 +74,7 @@ public:
 
 	virtual void learn() {}
 	
-	virtual void message_process(MessageContext& context, uint32_t* output) {}
+	virtual void message_process(MessageContext& context, uint32_t* ins, uint32_t* outs) {}
 
 	virtual void pre_process(ProcessContext& context);
 	virtual void process(ProcessContext& context) = 0;
diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp
index 5695f0fc..e120db0e 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/engine/NodeImpl.hpp
@@ -114,7 +114,7 @@ public:
 	
 	/** Run the node for one instant in the message thread.
 	 */
-	virtual void message_process(MessageContext& context, uint32_t* output) = 0;
+	virtual void message_process(MessageContext& context, uint32_t* ins, uint32_t* outs) = 0;
 
 	/** Run the node for @a nframes input/output.
 	 *
-- 
cgit v1.2.1