summaryrefslogtreecommitdiffstats
path: root/src/engine/OSCEngineReceiver.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-19 21:27:38 +0000
committerDavid Robillard <d@drobilla.net>2011-04-19 21:27:38 +0000
commit74c76bd82792b03bd12f30aa875fae3e5047ccc2 (patch)
treefc547c60d974b2f064c2e401ddcbecee82ed9d2a /src/engine/OSCEngineReceiver.cpp
parent08759b27bc19de59bfd17fc929ee7e0021181ffb (diff)
downloadingen-74c76bd82792b03bd12f30aa875fae3e5047ccc2.tar.gz
ingen-74c76bd82792b03bd12f30aa875fae3e5047ccc2.tar.bz2
ingen-74c76bd82792b03bd12f30aa875fae3e5047ccc2.zip
Remove EngineInterface::quit().
Use del("ingen:engine") instead. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3172 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/OSCEngineReceiver.cpp')
-rw-r--r--src/engine/OSCEngineReceiver.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 1b8d1179..9e2193e5 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -94,7 +94,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
// Commands
lo_server_add_method(_server, "/ping", "i", ping_cb, this);
lo_server_add_method(_server, "/ping_queued", "i", ping_slow_cb, this);
- lo_server_add_method(_server, "/quit", "i", quit_cb, this);
lo_server_add_method(_server, "/register_client", "i", register_client_cb, this);
lo_server_add_method(_server, "/unregister_client", "i", unregister_client_cb, this);
lo_server_add_method(_server, "/put", NULL, put_cb, this);
@@ -269,22 +268,6 @@ OSCEngineReceiver::_ping_slow_cb(const char* path, const char* types, lo_arg** a
}
/** \page engine_osc_namespace
- * <h2>/quit</h2>
- * \arg \b response-id (integer)
- *
- * Terminate the engine.
- * Note that there are NO order guarantees with this command at all. You could
- * send 10 messages then quit, and the quit reply could come immediately and the
- * 10 messages would never get executed.
- */
-int
-OSCEngineReceiver::_quit_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
- quit();
- return 0;
-}
-
-/** \page engine_osc_namespace
* <h2>/register_client</h2>
* \arg \b response-id (integer)
*
@@ -388,9 +371,9 @@ OSCEngineReceiver::_move_cb(const char* path, const char* types, lo_arg** argv,
int
OSCEngineReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
- const char* obj_path = &argv[1]->s;
+ const char* uri = &argv[1]->s;
- del(obj_path);
+ del(uri);
return 0;
}