diff options
| -rw-r--r-- | src/client/OSCClientReceiver.cpp | 4 | ||||
| -rw-r--r-- | src/client/OSCClientReceiver.hpp | 2 | ||||
| -rw-r--r-- | src/client/OSCEngineSender.cpp | 2 | ||||
| -rw-r--r-- | src/engine/OSCEngineReceiver.cpp | 25 |
4 files changed, 26 insertions, 7 deletions
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index ece3289c..ec1f1378 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -145,7 +145,7 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/plugin", "sss", plugin_cb, this); lo_server_thread_add_method(_st, "/ingen/put", NULL, put_cb, this); lo_server_thread_add_method(_st, "/ingen/move", "ss", move_cb, this); - lo_server_thread_add_method(_st, "/ingen/delete", "s", destroyed_cb, this); + lo_server_thread_add_method(_st, "/ingen/delete", "s", del_cb, this); lo_server_thread_add_method(_st, "/ingen/clear_patch", "s", clear_patch_cb, this); lo_server_thread_add_method(_st, "/ingen/new_connection", "ss", connection_cb, this); lo_server_thread_add_method(_st, "/ingen/disconnection", "ss", disconnection_cb, this); @@ -169,7 +169,7 @@ OSCClientReceiver::_error_cb(const char* path, const char* types, lo_arg** argv, int -OSCClientReceiver::_destroyed_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { _target->del((const char*)&argv[0]->s); return 0; diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index 4e788f08..d44c4ddb 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -84,7 +84,7 @@ private: LO_HANDLER(plugin); LO_HANDLER(plugin_list_end); LO_HANDLER(new_patch); - LO_HANDLER(destroyed); + LO_HANDLER(del); LO_HANDLER(clear_patch); LO_HANDLER(move); LO_HANDLER(connection); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 3952b802..ac0d948c 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -155,7 +155,7 @@ OSCEngineSender::move(const Path& old_path, void OSCEngineSender::del(const Path& path) { - send("/ingen/destroy", "is", + send("/ingen/delete", "is", next_id(), path.c_str(), LO_ARGS_END); diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index a5f01c74..21a9b898 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -95,7 +95,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t lo_server_add_method(_server, "/ingen/set_polyphonic", "isF", set_polyphonic_cb, this); lo_server_add_method(_server, "/ingen/put", NULL, put_cb, this); lo_server_add_method(_server, "/ingen/move", "iss", move_cb, this); - lo_server_add_method(_server, "/ingen/del", "is", del_cb, this); + lo_server_add_method(_server, "/ingen/delete", "is", del_cb, this); lo_server_add_method(_server, "/ingen/connect", "iss", connect_cb, this); lo_server_add_method(_server, "/ingen/disconnect", "iss", disconnect_cb, this); lo_server_add_method(_server, "/ingen/disconnect_all", "iss", disconnect_all_cb, this); @@ -378,12 +378,31 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo /** \page engine_osc_namespace + * <h2>/ingen/put</h2> + * \arg \b response-id (integer) + * \arg \b path (string) - Path of object + * \arg \b predicate + * \arg \b value + * \arg \b ... + * + * PUT a set of properties to a path (see \ref methods). + */ +int +OSCEngineReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +{ + //const char* path = &argv[1]->s; + + return 0; +} + + +/** \page engine_osc_namespace * <h2>/ingen/move</h2> * \arg \b response-id (integer) * \arg \b old-path - Object's path * \arg \b new-path - Object's new path * - * Move (rename) an Object. + * MOVE an object to a new path (see \ref methods). */ int OSCEngineReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -418,7 +437,7 @@ OSCEngineReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** * \arg \b response-id (integer) * \arg \b path (string) - Full path of the object * - * Delete a graph object. + * DELETE an object (see \ref methods). */ int OSCEngineReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) |