summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-11-10 21:00:50 +0000
committerDavid Robillard <d@drobilla.net>2008-11-10 21:00:50 +0000
commit1423712f8e91dffde60c07d32b4de878bdcd3eae (patch)
treee83d7a8e3840a476bf7ac2cdb4252656f08b0133 /src/engine
parentfb76b922a4d3b0f7e49ea1dcb21fec0c3a236b3f (diff)
downloadingen-1423712f8e91dffde60c07d32b4de878bdcd3eae.tar.gz
ingen-1423712f8e91dffde60c07d32b4de878bdcd3eae.tar.bz2
ingen-1423712f8e91dffde60c07d32b4de878bdcd3eae.zip
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
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/OSCClientSender.cpp4
-rw-r--r--src/engine/OSCClientSender.hpp2
-rw-r--r--src/engine/OSCEngineReceiver.cpp4
-rw-r--r--src/engine/ObjectSender.cpp2
-rw-r--r--src/engine/QueuedEngineInterface.cpp4
-rw-r--r--src/engine/QueuedEngineInterface.hpp2
6 files changed, 9 insertions, 9 deletions
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,