Turn off OSC debug dumping in engine.

Shuffle new_port parameters to make more sense for no particular reason.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1715 a436a847-0d15-0410-975c-d299462d15a1

23 files changed, 38 insertions, 38 deletions

diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index 1d46437a..59c9d842 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -49,8 +49,8 @@ public:
 	                      const std::string& plugin_uri) {}
 	
 	virtual void new_port(const std::string& path,
+	                      const std::string& type,
 	                      uint32_t           index,
-	                      const std::string& data_type,
 	                      bool               is_output)  {}
 	
 	virtual void patch_cleared(const std::string& path)  {}
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 31ecbd3e..fbcf5929 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -452,7 +452,7 @@ ClientStore::new_node(const string& path, const string& plugin_uri)
 
 
 void
-ClientStore::new_port(const string& path, uint32_t index, const string& type, bool is_output)
+ClientStore::new_port(const string& path, const string& type, uint32_t index, bool is_output)
 {
 	PortModel::Direction pdir = is_output ? PortModel::OUTPUT : PortModel::INPUT;
 
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 4df8149b..291f9af9 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -72,7 +72,7 @@ public:
 	void new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name);
 	void new_patch(const string& path, uint32_t poly);
 	void new_node(const string& path, const string& plugin_uri);
-	void new_port(const string& path, uint32_t index, const string& data_type, bool is_output);
+	void new_port(const string& path, const string& type, uint32_t index, bool is_output);
 	void set_variable(const string& subject_path, const string& predicate, const Atom& value);
 	void set_property(const string& subject_path, const string& predicate, const Atom& value);
 	void set_port_value(const string& port_path, const Raul::Atom& value);
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index 256b2947..a93fd96d 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -457,22 +457,22 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
 		if (plugin_type == "Internal") {
 			// FIXME: indices
 			if (plugin_label == "audio_input") {
-				_engine->new_port(path, 0, "lv2:AudioPort", false);
+				_engine->new_port(path, "lv2:AudioPort", 0, false);
 				is_port = true;
 			} else if (plugin_label == "audio_output") {
-				_engine->new_port(path, 0, "lv2:AudioPort", true);
+				_engine->new_port(path, "lv2:AudioPort", 0, true);
 				is_port = true;
 			} else if (plugin_label == "control_input") {
-				_engine->new_port(path, 0, "lv2:ControlPort", false);
+				_engine->new_port(path, "lv2:ControlPort", 0, false);
 				is_port = true;
 			} else if (plugin_label == "control_output" ) {
-				_engine->new_port(path, 0, "lv2:ControlPort", true);
+				_engine->new_port(path, "lv2:ControlPort", 0, true);
 				is_port = true;
 			} else if (plugin_label == "midi_input") {
-				_engine->new_port(path, 0, "ingen:EventPort", false);
+				_engine->new_port(path, "ingen:EventPort", 0, false);
 				is_port = true;
 			} else if (plugin_label == "midi_output" ) {
-				_engine->new_port(path, 0, "ingen:EventPort", true);
+				_engine->new_port(path, "ingen:EventPort", 0, true);
 				is_port = true;
 			} else {
 				cerr << "WARNING: Unknown internal plugin label \"" << plugin_label << "\"" << endl;
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 312c10ba..7a6366e0 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -109,8 +109,8 @@ HTTPEngineSender::new_patch(const string& path,
 
 void
 HTTPEngineSender::new_port(const string& path,
+                           const string& type,
                            uint32_t      index,
-                           const string& data_type,
                            bool          is_output)
 {
 }
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 411ddfd5..67cf9152 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -80,8 +80,8 @@ public:
 	               uint32_t      poly);
 
 	void new_port(const string& path,
+	              const string& type,
 	              uint32_t      index,
-	              const string& data_type,
 	              bool          is_output);
 
 	void new_node(const string& path,
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index f1c4e4eb..fa191206 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -251,7 +251,7 @@ OSCClientReceiver::_new_port_cb(const char* path, const char* types, lo_arg** ar
 	const char*    type      = &argv[2]->s;
 	const bool     is_output = (argv[3]->i == 1);
 
-	_target->new_port(port_path, index, type, is_output);
+	_target->new_port(port_path, type, index, is_output);
 	
 	return 0;	
 }
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 0111ac8f..1eb9ad6e 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -141,15 +141,15 @@ OSCEngineSender::new_patch(const string& path,
 
 void
 OSCEngineSender::new_port(const string& path,
+                          const string& type,
                           uint32_t      index,
-                          const string& data_type,
                           bool          is_output)
 {
 	// FIXME: use index
 	send("/ingen/new_port",  "issi",
 		next_id(),
 		path.c_str(),
-		data_type.c_str(),
+		type.c_str(),
 		(is_output ? 1 : 0),
 		LO_ARGS_END);
 }
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index ea156c34..12b062e4 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -84,8 +84,8 @@ public:
 	               uint32_t      poly);
 
 	void new_port(const string& path,
+	              const string& type,
 	              uint32_t      index,
-	              const string& data_type,
 	              bool          is_output);
 
 	void new_node(const string& path,
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 7ab32c12..63586832 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -56,7 +56,7 @@ public:
 	sigc::signal<void, string, string, string, string>     signal_new_plugin; 
 	sigc::signal<void, string, uint32_t>                   signal_new_patch; 
 	sigc::signal<void, string, string>                     signal_new_node; 
-	sigc::signal<void, string, uint32_t, string, bool>     signal_new_port; 
+	sigc::signal<void, string, string, uint32_t, bool>     signal_new_port; 
 	sigc::signal<void, string>                             signal_patch_cleared; 
 	sigc::signal<void, string, string>                     signal_object_renamed; 
 	sigc::signal<void, string>                             signal_object_destroyed; 
@@ -109,8 +109,8 @@ protected:
 	void new_node(const string& path, const string& plugin_uri)
 		{ if (_enabled) signal_new_node.emit(path, plugin_uri); }
 	
-	void new_port(const string& path, uint32_t index, const string& data_type, bool is_output)
-		{ if (_enabled) signal_new_port.emit(path, index, data_type, is_output); }
+	void new_port(const string& path, const string& type, uint32_t index, bool is_output)
+		{ if (_enabled) signal_new_port.emit(path, type, index, is_output); }
 	
 	void connect(const string& src_port_path, const string& dst_port_path)
 		{ if (_enabled) signal_connection.emit(src_port_path, dst_port_path); }
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index a5a667df..f31ba37b 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -103,8 +103,8 @@ public:
 	void new_node(const string& path, const string& plugin_uri)
 		{ push_sig(sigc::bind(new_node_slot, path, plugin_uri)); }
 	
-	void new_port(const string& path, uint32_t index,  const string& data_type, bool is_output)
-		{ push_sig(sigc::bind(new_port_slot, path, index, data_type, is_output)); }
+	void new_port(const string& path, const string& type, uint32_t index, bool is_output)
+		{ push_sig(sigc::bind(new_port_slot, path, type, index, is_output)); }
 	
 	void connect(const string& src_port_path, const string& dst_port_path)
 		{ push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); }
@@ -162,7 +162,7 @@ private:
 	sigc::slot<void, string, string, string, string>     new_plugin_slot; 
 	sigc::slot<void, string, uint32_t>                   new_patch_slot; 
 	sigc::slot<void, string, string>                     new_node_slot; 
-	sigc::slot<void, string, uint32_t, string, bool>     new_port_slot;
+	sigc::slot<void, string, string, uint32_t, bool>     new_port_slot;
 	sigc::slot<void, string, string>                     connection_slot;
 	sigc::slot<void, string>                             patch_cleared_slot; 
 	sigc::slot<void, string>                             object_destroyed_slot; 
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index 1e43efe4..d5a40711 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -51,8 +51,8 @@ public:
 	                      const std::string& plugin_uri) = 0;
 	
 	virtual void new_port(const std::string& path,
+	                      const std::string& type,
 	                      uint32_t           index,
-	                      const std::string& data_type,
 	                      bool               is_output) = 0;
 	
 	virtual void connect(const std::string& src_port_path,
diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp
index 162f02cd..d9893241 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/engine/OSCClientSender.cpp
@@ -156,11 +156,11 @@ void OSCClientSender::new_node(const std::string& node_path,
  */
 void
 OSCClientSender::new_port(const std::string& path,
+                          const std::string& type,
                           uint32_t           index,
-                          const std::string& data_type,
                           bool               is_output)
 {
-	send("/ingen/new_port", "sisi", path.c_str(), index, data_type.c_str(), is_output, LO_ARGS_END);
+	send("/ingen/new_port", "sisi", path.c_str(), index, type.c_str(), is_output, LO_ARGS_END);
 }
 
 
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index c8c8418f..3de967ab 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -82,8 +82,8 @@ public:
 	                      const std::string&   plugin_uri);
 	
 	virtual void new_port(const std::string& path,
+	                      const std::string& type,
 	                      uint32_t           index,
-	                      const std::string& data_type,
 	                      bool               is_output);
 	
 	virtual void patch_cleared(const std::string& path);
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index de626c50..8ef819e8 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -71,7 +71,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 	}
 
 	// For debugging, print all incoming OSC messages
-	lo_server_add_method(_server, NULL, NULL, generic_cb, NULL);
+	//lo_server_add_method(_server, NULL, NULL, generic_cb, NULL);
 
 	// Set response address for this message.
 	// It's important this is first and returns nonzero.
@@ -467,7 +467,7 @@ OSCEngineReceiver::_new_port_cb(const char* path, const char* types, lo_arg** ar
 	const char*   data_type   = &argv[2]->s;
 	const int32_t direction   =  argv[3]->i;
 	
-	new_port(port_path, 0, data_type, (direction == 1));
+	new_port(port_path, data_type, 0, (direction == 1));
 	return 0;
 }
 
diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp
index 688cea8e..bb2de6f8 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/engine/ObjectSender.cpp
@@ -122,7 +122,7 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port)
 	
 	client->bundle_begin();
 
-	client->new_port(port->path(), port->index(), port->type().uri(), port->is_output());
+	client->new_port(port->path(), port->type().uri(), port->index(), port->is_output());
 	client->set_property(port->path(), "ingen:polyphonic", port->polyphonic());
 	
 	// Send variable
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 4e0e82d1..76866198 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -148,11 +148,11 @@ QueuedEngineInterface::new_patch(const string& path,
 
 // FIXME: use index
 void QueuedEngineInterface::new_port(const string& path,
+                                     const string& type,
                                      uint32_t      index,
-                                     const string& data_type,
                                      bool          direction)
 {
-	push_queued(new CreatePortEvent(_engine, _responder, now(), path, data_type, direction, this));
+	push_queued(new CreatePortEvent(_engine, _responder, now(), path, type, direction, this));
 }
 
 
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 77c1178d..82513cb2 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -77,8 +77,8 @@ public:
 	                       uint32_t      poly);
 
 	virtual void new_port(const string& path,
+	                      const string& type,
 	                      uint32_t      index,
-	                      const string& data_type,
 	                      bool          direction);
 
 	virtual void new_node(const string& path,
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index cb596791..acbd8efe 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -709,7 +709,7 @@ PatchCanvas::menu_add_port(const string& name, const string& type, bool is_outpu
 {
 	const Path& path = _patch->path().base() + generate_port_name(name);
 	App::instance().engine()->bundle_begin();
-	App::instance().engine()->new_port(path, _patch->num_ports(), type, is_output);
+	App::instance().engine()->new_port(path, type, _patch->num_ports(), is_output);
 	GraphObject::Variables data = get_initial_data();
 	for (GraphObject::Variables::const_iterator i = data.begin(); i != data.end(); ++i)
 		App::instance().engine()->set_variable(path, i->first, i->second);
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 73f55074..00034554 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -399,7 +399,7 @@ Parser::parse_patch(
 		if (created.find(port_path) == created.end()) {
 			bool is_output = (type == "lv2:OutputPort"); // FIXME: check validity
 			// FIXME: read index
-			target->new_port(port_path, 0, datatype, is_output);
+			target->new_port(port_path, datatype, 0, is_output);
 			created.insert(port_path);
 		}
 
@@ -499,7 +499,7 @@ Parser::parse_port(
 
 		bool is_output = (type == "lv2:OutputPort");
 		// FIXME: read index
-		target->new_port(path, 0, datatype, is_output);
+		target->new_port(path, datatype, 0, is_output);
 		
 		const Redland::Node& val_node = (*i)["value"];
 		if (val_node.to_string() != "")
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 48950e2e..28833fc9 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -66,7 +66,7 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object)
 	SharedPtr<const Port> port = PtrCast<const Port>(object);
 	if (port) {
 		Raul::Path path = prefix.base() + port->path().substr(1);
-		_interface.new_port(path, port->index(), port->type().uri(), !port->is_input());
+		_interface.new_port(path, port->type().uri(), port->index(), !port->is_input());
 		build_object(prefix, object);
 		return;
 	}
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index d5d1d245..ca322b74 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -144,11 +144,11 @@ ClashAvoider::new_node(const std::string& path,
 
 void
 ClashAvoider::new_port(const std::string& path,
+                       const std::string& type,
                        uint32_t           index,
-                       const std::string& data_type,
                        bool               is_output)
 {
-	_target.new_port(map_path(path), index, data_type, is_output);
+	_target.new_port(map_path(path), type, index, is_output);
 }
 
 
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index c6501b5f..ac2d62bb 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -56,8 +56,8 @@ public:
 	              const std::string& plugin_uri);
 	
 	void new_port(const std::string& path,
+	              const std::string& type,
 	              uint32_t           index,
-	              const std::string& data_type,
 	              bool               is_output);
 	
 	void connect(const std::string& src_port_path,