diff options
Diffstat (limited to 'src')
43 files changed, 156 insertions, 145 deletions
diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp index 5e9ed094..ca717df0 100644 --- a/src/bindings/Client.hpp +++ b/src/bindings/Client.hpp @@ -47,8 +47,8 @@ public: virtual void clear_patch(const std::string& path) {} - virtual void rename(const std::string& old_path, - const std::string& new_path) {} + virtual void move(const std::string& old_path, + const std::string& new_path) {} virtual void connect(const std::string& src_port_path, const std::string& dst_port_path) {} diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index c28bdca0..3a1acc21 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -43,8 +43,8 @@ ClientStore::ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientI if (!emitter) return; - emitter->signal_object_destroyed.connect(sigc::mem_fun(this, &ClientStore::destroy)); - emitter->signal_object_renamed.connect(sigc::mem_fun(this, &ClientStore::rename)); + emitter->signal_object_destroyed.connect(sigc::mem_fun(this, &ClientStore::del)); + emitter->signal_object_moved.connect(sigc::mem_fun(this, &ClientStore::move)); emitter->signal_new_plugin.connect(sigc::mem_fun(this, &ClientStore::new_plugin)); emitter->signal_put.connect(sigc::mem_fun(this, &ClientStore::put)); emitter->signal_clear_patch.connect(sigc::mem_fun(this, &ClientStore::clear_patch)); @@ -205,7 +205,7 @@ ClientStore::add_plugin(SharedPtr<PluginModel> pm) void -ClientStore::destroy(const Path& path) +ClientStore::del(const Path& path) { SharedPtr<ObjectModel> removed = remove_object(path); removed.reset(); @@ -213,14 +213,14 @@ ClientStore::destroy(const Path& path) } void -ClientStore::rename(const Path& old_path_str, const Path& new_path_str) +ClientStore::move(const Path& old_path_str, const Path& new_path_str) { Path old_path(old_path_str); Path new_path(new_path_str); iterator parent = find(old_path); if (parent == end()) { - cerr << "[Store] Failed to find object " << old_path << " to rename." << endl; + cerr << "[Store] Failed to find object " << old_path << " to move." << endl; return; } diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index 68b87889..6688bc23 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -70,14 +70,14 @@ public: void new_plugin(const Raul::URI& uri, const Raul::URI& type_uri, const Raul::Symbol& symbol); bool new_object(const Shared::GraphObject* object); void put(const Raul::Path& path, const Shared::Resource::Properties& properties); - void rename(const Raul::Path& old_path, const Raul::Path& new_path); + void move(const Raul::Path& old_path, const Raul::Path& new_path); void set_variable(const Raul::URI& subject_path, const Raul::URI& predicate, const Raul::Atom& value); void set_property(const Raul::URI& subject_path, const Raul::URI& predicate, const Raul::Atom& value); void set_port_value(const Raul::Path& port_path, const Raul::Atom& value); void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); - void destroy(const Raul::Path& path); + void del(const Raul::Path& path); sigc::signal<void, SharedPtr<ObjectModel> > signal_new_object; sigc::signal<void, SharedPtr<PluginModel> > signal_new_plugin; @@ -97,7 +97,7 @@ private: void bundle_end() {} // Slots for SigClientInterface signals - void object_renamed(const Raul::Path& old_path, const Raul::Path& new_path); + void object_moved(const Raul::Path& old_path, const Raul::Path& new_path); void clear_patch(const Raul::Path& path); void activity(const Raul::Path& path); diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index 596793f9..48b861d5 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -112,14 +112,14 @@ HTTPEngineSender::put(const Raul::Path& path, void -HTTPEngineSender::rename(const Path& old_path, - const Path& new_path) +HTTPEngineSender::move(const Path& old_path, + const Path& new_path) { } void -HTTPEngineSender::destroy(const Path& path) +HTTPEngineSender::del(const Path& path) { } diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 41107cb0..c284995e 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -79,10 +79,10 @@ public: virtual void clear_patch(const Raul::Path& path); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index e8b8c33b..9c94659a 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -146,7 +146,7 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/new_patch", "si", new_patch_cb, this); lo_server_thread_add_method(_st, "/ingen/destroyed", "s", destroyed_cb, this); lo_server_thread_add_method(_st, "/ingen/clear_patch", "s", clear_patch_cb, this); - lo_server_thread_add_method(_st, "/ingen/rename", "ss", rename_cb, this); + lo_server_thread_add_method(_st, "/ingen/move", "ss", move_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); lo_server_thread_add_method(_st, "/ingen/new_port", "sisi", new_port_cb, this); @@ -172,7 +172,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) { - _target->destroy((const char*)&argv[0]->s); + _target->del((const char*)&argv[0]->s); return 0; } @@ -186,9 +186,9 @@ OSCClientReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** int -OSCClientReceiver::_rename_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - _target->rename((const char*)&argv[0]->s, (const char*)&argv[1]->s); + _target->move((const char*)&argv[0]->s, (const char*)&argv[1]->s); return 0; } diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index 58f66836..4e788f08 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -86,7 +86,7 @@ private: LO_HANDLER(new_patch); LO_HANDLER(destroyed); LO_HANDLER(clear_patch); - LO_HANDLER(rename); + LO_HANDLER(move); LO_HANDLER(connection); LO_HANDLER(disconnection); LO_HANDLER(new_port); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 23a98934..3952b802 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -141,10 +141,10 @@ OSCEngineSender::put(const Raul::Path& path, void -OSCEngineSender::rename(const Path& old_path, - const Path& new_path) +OSCEngineSender::move(const Path& old_path, + const Path& new_path) { - send("/ingen/rename", "iss", + send("/ingen/move", "iss", next_id(), old_path.c_str(), new_path.c_str(), @@ -153,7 +153,7 @@ OSCEngineSender::rename(const Path& old_path, void -OSCEngineSender::destroy(const Path& path) +OSCEngineSender::del(const Path& path) { send("/ingen/destroy", "is", next_id(), diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 2b02ca6e..a7479f70 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -82,10 +82,10 @@ public: virtual void clear_patch(const Raul::Path& path); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 8c7c631d..f47bdfa6 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -82,14 +82,14 @@ public: sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_variable; sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_property; sigc::signal<void> signal_destroyed; - sigc::signal<void> signal_renamed; + sigc::signal<void> signal_moved; protected: friend class ClientStore; ObjectModel(const Raul::Path& path); - virtual void set_path(const Raul::Path& p) { _path = p; signal_renamed.emit(); } + virtual void set_path(const Raul::Path& p) { _path = p; signal_moved.emit(); } virtual void set_parent(SharedPtr<ObjectModel> p) { assert(p); _parent = p; } virtual void add_child(SharedPtr<ObjectModel> c) {} virtual bool remove_child(SharedPtr<ObjectModel> c) { return true; } diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index 7c3bee05..a95336d5 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -55,7 +55,7 @@ public: sigc::signal<void, Raul::Path, Raul::URI, uint32_t, bool> signal_new_port; sigc::signal<void, Raul::Path, Shared::Resource::Properties> signal_put; sigc::signal<void, Raul::Path> signal_clear_patch; - sigc::signal<void, Raul::Path, Raul::Path> signal_object_renamed; + sigc::signal<void, Raul::Path, Raul::Path> signal_object_moved; sigc::signal<void, Raul::Path> signal_object_destroyed; sigc::signal<void, Raul::Path, Raul::Path> signal_connection; sigc::signal<void, Raul::Path, Raul::Path> signal_disconnection; @@ -104,14 +104,14 @@ protected: void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) { if (_enabled) signal_connection.emit(src_port_path, dst_port_path); } - void destroy(const Raul::Path& path) + void del(const Raul::Path& path) { if (_enabled) signal_object_destroyed.emit(path); } void clear_patch(const Raul::Path& path) { if (_enabled) signal_clear_patch.emit(path); } - void rename(const Raul::Path& old_path, const Raul::Path& new_path) - { if (_enabled) signal_object_renamed.emit(old_path, new_path); } + void move(const Raul::Path& old_path, const Raul::Path& new_path) + { if (_enabled) signal_object_moved.emit(old_path, new_path); } void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) { if (_enabled) signal_disconnection.emit(src_port_path, dst_port_path); } diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index 7b7d11e2..f0fa5321 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -56,7 +56,7 @@ public: , connection_slot(signal_connection.make_slot()) , clear_patch_slot(signal_clear_patch.make_slot()) , object_destroyed_slot(signal_object_destroyed.make_slot()) - , object_renamed_slot(signal_object_renamed.make_slot()) + , object_moved_slot(signal_object_moved.make_slot()) , disconnection_slot(signal_disconnection.make_slot()) , variable_change_slot(signal_variable_change.make_slot()) , property_change_slot(signal_property_change.make_slot()) @@ -98,14 +98,14 @@ public: void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) { push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); } - void destroy(const Raul::Path& path) + void del(const Raul::Path& path) { push_sig(sigc::bind(object_destroyed_slot, path)); } void clear_patch(const Raul::Path& path) { push_sig(sigc::bind(clear_patch_slot, path)); } - void rename(const Raul::Path& old_path, const Raul::Path& new_path) - { push_sig(sigc::bind(object_renamed_slot, old_path, new_path)); } + void move(const Raul::Path& old_path, const Raul::Path& new_path) + { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); } void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) { push_sig(sigc::bind(disconnection_slot, src_port_path, dst_port_path)); } @@ -148,7 +148,7 @@ private: sigc::slot<void, Raul::Path, Raul::Path> connection_slot; sigc::slot<void, Raul::Path> clear_patch_slot; sigc::slot<void, Raul::Path> object_destroyed_slot; - sigc::slot<void, Raul::Path, Raul::Path> object_renamed_slot; + sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot; sigc::slot<void, Raul::Path, Raul::Path> disconnection_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> property_change_slot; diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp index 3c81a4a3..89a96978 100644 --- a/src/common/interface/CommonInterface.hpp +++ b/src/common/interface/CommonInterface.hpp @@ -48,8 +48,10 @@ public: virtual void put(const Raul::Path& path, const Resource::Properties& properties) = 0; - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path) = 0; + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path) = 0; + + virtual void del(const Raul::Path& path) = 0; virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) = 0; @@ -72,8 +74,6 @@ public: uint32_t voice, const Raul::Atom& value) = 0; - virtual void destroy(const Raul::Path& path) = 0; - virtual void clear_patch(const Raul::Path& patch_path) = 0; }; diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp index 6fca9b17..beb08f22 100644 --- a/src/engine/ClientBroadcaster.cpp +++ b/src/engine/ClientBroadcaster.cpp @@ -135,7 +135,7 @@ void ClientBroadcaster::send_destroyed(const Path& path) { for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) - (*i).second->destroy(path); + (*i).second->del(path); } @@ -223,10 +223,10 @@ ClientBroadcaster::send_object(const GraphObjectImpl* p, bool recursive) /** Sends notification of an GraphObject's renaming */ void -ClientBroadcaster::send_rename(const Path& old_path, const Path& new_path) +ClientBroadcaster::send_move(const Path& old_path, const Path& new_path) { for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) - (*i).second->rename(old_path, new_path); + (*i).second->move(old_path, new_path); } diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index 18d7647f..a207b6d7 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -68,7 +68,7 @@ public: void send_clear_patch(const Raul::Path& patch_path); void send_connection(const SharedPtr<const ConnectionImpl> connection); void send_disconnection(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); - void send_rename(const Raul::Path& old_path, const Raul::Path& new_path); + void send_move(const Raul::Path& old_path, const Raul::Path& new_path); void send_variable_change(const Raul::URI& node_path, const Raul::URI& key, const Raul::Atom& value); void send_property_change(const Raul::URI& node_path, const Raul::URI& key, const Raul::Atom& value); void send_port_value(const Raul::Path& port_path, const Raul::Atom& value); diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp index b3fd1bc0..83d3f1b2 100644 --- a/src/engine/HTTPClientSender.cpp +++ b/src/engine/HTTPClientSender.cpp @@ -50,15 +50,15 @@ HTTPClientSender::error(const std::string& msg) void -HTTPClientSender::put(const Raul::Path& path, - const Shared::Resource::Properties& properties) +HTTPClientSender::put(const Path& path, + const Shared::Resource::Properties& properties) { cerr << "HTTP CLIENT PUT " << path << endl; } void -HTTPClientSender::destroy(const Raul::Path& path) +HTTPClientSender::del(const Path& path) { assert(!path.is_root()); send_chunk(string("<").append(path.str()).append("> a <http://www.w3.org/2002/07/owl#Nothing> .")); @@ -66,14 +66,14 @@ HTTPClientSender::destroy(const Raul::Path& path) void -HTTPClientSender::clear_patch(const Raul::Path& patch_path) +HTTPClientSender::clear_patch(const Path& patch_path) { send_chunk(string("<").append(patch_path.str()).append("> ingen:empty true .")); } void -HTTPClientSender::connect(const Raul::Path& src_path, const Raul::Path& dst_path) +HTTPClientSender::connect(const Path& src_path, const Path& dst_path) { string msg = string( "@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n" @@ -87,14 +87,14 @@ HTTPClientSender::connect(const Raul::Path& src_path, const Raul::Path& dst_path void -HTTPClientSender::disconnect(const Raul::Path& src_path, const Raul::Path& dst_path) +HTTPClientSender::disconnect(const Path& src_path, const Path& dst_path) { //send("/ingen/disconnection", "ss", src_path.c_str(), dst_path.c_str(), LO_ARGS_END); } void -HTTPClientSender::set_variable(const Raul::URI& path, const Raul::URI& key, const Atom& value) +HTTPClientSender::set_variable(const URI& path, const URI& key, const Atom& value) { Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world, value); string msg = string( @@ -109,7 +109,7 @@ HTTPClientSender::set_variable(const Raul::URI& path, const Raul::URI& key, cons void -HTTPClientSender::set_property(const Raul::URI& path, const Raul::URI& key, const Atom& value) +HTTPClientSender::set_property(const URI& path, const URI& key, const Atom& value) { Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world, value); string msg = string( @@ -125,7 +125,7 @@ HTTPClientSender::set_property(const Raul::URI& path, const Raul::URI& key, cons void -HTTPClientSender::set_port_value(const Raul::Path& port_path, const Raul::Atom& value) +HTTPClientSender::set_port_value(const Path& port_path, const Atom& value) { Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world, value); string msg = string( @@ -136,17 +136,17 @@ HTTPClientSender::set_port_value(const Raul::Path& port_path, const Raul::Atom& void -HTTPClientSender::set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) +HTTPClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) { /*lo_message m = lo_message_new(); lo_message_add_string(m, port_path.c_str()); - Raul::AtomLiblo::lo_message_add_atom(m, value); + AtomLiblo::lo_message_add_atom(m, value); send_message("/ingen/set_port_value", m);*/ } void -HTTPClientSender::activity(const Raul::Path& path) +HTTPClientSender::activity(const Path& path) { string msg = string( "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n\n<").append( @@ -174,9 +174,9 @@ HTTPClientSender::new_object(const Shared::GraphObject* object) void -HTTPClientSender::new_plugin(const Raul::URI& uri, - const Raul::URI& type_uri, - const Raul::Symbol& symbol) +HTTPClientSender::new_plugin(const URI& uri, + const URI& type_uri, + const Symbol& symbol) { /*lo_message m = lo_message_new(); lo_message_add_string(m, uri.c_str()); @@ -188,7 +188,7 @@ HTTPClientSender::new_plugin(const Raul::URI& uri, void -HTTPClientSender::rename(const Raul::Path& old_path, const Raul::Path& new_path) +HTTPClientSender::move(const Path& old_path, const Path& new_path) { string msg = string( "@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n" diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index e4a88112..fb045194 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -83,10 +83,10 @@ public: virtual void clear_patch(const Raul::Path& path); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index 55a42e9f..c0a6b85b 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -133,7 +133,7 @@ OSCClientSender::put(const Raul::Path& path, * \arg \b path (string) - Path of object (which no longer exists) </p> \n \n */ void -OSCClientSender::destroy(const Path& path) +OSCClientSender::del(const Path& path) { send("/ingen/destroyed", "s", path.c_str(), LO_ARGS_END); } @@ -274,14 +274,14 @@ OSCClientSender::new_plugin(const URI& uri, /** \page client_osc_namespace - * <p> \b /ingen/rename - Notification of an object's renaming + * <p> \b /ingen/move - Notification of an object's renaming * \arg \b old-path (string) - Old path of object * \arg \b new-path (string) - New path of object </p> \n \n */ void -OSCClientSender::rename(const Path& old_path, const Path& new_path) +OSCClientSender::move(const Path& old_path, const Path& new_path) { - send("/ingen/rename", "ss", old_path.c_str(), new_path.c_str(), LO_ARGS_END); + send("/ingen/move", "ss", old_path.c_str(), new_path.c_str(), LO_ARGS_END); } diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index b66ff59d..4a0742eb 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -80,10 +80,10 @@ public: virtual void clear_patch(const Raul::Path& path); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index 37a8132a..28509ad7 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -93,10 +93,9 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t lo_server_add_method(_server, "/ingen/set_polyphony", "isi", set_polyphony_cb, this); lo_server_add_method(_server, "/ingen/set_polyphonic", "isT", set_polyphonic_cb, this); lo_server_add_method(_server, "/ingen/set_polyphonic", "isF", set_polyphonic_cb, this); - lo_server_add_method(_server, "/ingen/new_port", "issi", new_port_cb, this); - lo_server_add_method(_server, "/ingen/put", NULL, new_port_cb, this); - lo_server_add_method(_server, "/ingen/destroy", "is", destroy_cb, this); - lo_server_add_method(_server, "/ingen/rename", "iss", rename_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/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); @@ -366,18 +365,18 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo /** \page engine_osc_namespace - * <p> \b /ingen/rename - Rename an Object (only Nodes, for now) + * <p> \b /ingen/move - Move (rename) an Object * \arg \b response-id (integer) * \arg \b old-path - Object's path * \arg \b new-path - Object's new path </p> \n \n */ int -OSCEngineReceiver::_rename_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCEngineReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { const char* old_path = &argv[1]->s; const char* new_path = &argv[2]->s; - rename(old_path, new_path); + move(old_path, new_path); return 0; } @@ -398,16 +397,16 @@ OSCEngineReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** /** \page engine_osc_namespace - * <p> \b /ingen/destroy - Removes (destroys) a Patch or a Node + * <p> \b /ingen/del - Delete a graph object * \arg \b response-id (integer) - * \arg \b node-path (string) - Full path of the object </p> \n \n + * \arg \b path (string) - Full path of the object </p> \n \n */ int -OSCEngineReceiver::_destroy_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCEngineReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - const char* node_path = &argv[1]->s; + const char* obj_path = &argv[1]->s; - destroy(node_path); + del(obj_path); return 0; } diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index fada5a17..82541cc6 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -90,13 +90,12 @@ private: LO_HANDLER(engine_activate); LO_HANDLER(engine_deactivate); LO_HANDLER(new_patch); - LO_HANDLER(rename); - LO_HANDLER(new_port); LO_HANDLER(put); + LO_HANDLER(move); + LO_HANDLER(del); LO_HANDLER(clear_patch); LO_HANDLER(set_polyphony); LO_HANDLER(set_polyphonic); - LO_HANDLER(destroy); LO_HANDLER(connect); LO_HANDLER(disconnect); LO_HANDLER(disconnect_all); diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index a1192c03..7c9c2c1a 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -184,17 +184,17 @@ QueuedEngineInterface::put(const Path& path, void -QueuedEngineInterface::rename(const Path& old_path, - const Path& new_path) +QueuedEngineInterface::move(const Path& old_path, + const Path& new_path) { - push_queued(new RenameEvent(_engine, _responder, now(), old_path, new_path)); + push_queued(new MoveEvent(_engine, _responder, now(), old_path, new_path)); } void -QueuedEngineInterface::destroy(const Path& path) +QueuedEngineInterface::del(const Path& path) { - push_queued(new DestroyEvent(_engine, _responder, now(), this, path)); + push_queued(new DeleteEvent(_engine, _responder, now(), this, path)); } diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index f12a1b23..2a94abff 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -74,8 +74,8 @@ public: virtual void put(const Raul::Path& path, const Shared::Resource::Properties& properties); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); @@ -98,7 +98,7 @@ public: uint32_t voice, const Raul::Atom& value); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); virtual void clear_patch(const Raul::Path& patch_path); diff --git a/src/engine/events.hpp b/src/engine/events.hpp index ee8ab43e..8342fd45 100644 --- a/src/engine/events.hpp +++ b/src/engine/events.hpp @@ -27,7 +27,7 @@ #include "events/CreatePatchEvent.hpp" #include "events/CreatePortEvent.hpp" #include "events/DeactivateEvent.hpp" -#include "events/DestroyEvent.hpp" +#include "events/DeleteEvent.hpp" #include "events/DisconnectAllEvent.hpp" #include "events/DisconnectionEvent.hpp" #include "events/LoadPluginsEvent.hpp" @@ -35,7 +35,7 @@ #include "events/NoteEvent.hpp" #include "events/PingQueuedEvent.hpp" #include "events/RegisterClientEvent.hpp" -#include "events/RenameEvent.hpp" +#include "events/MoveEvent.hpp" #include "events/RequestAllObjectsEvent.hpp" #include "events/RequestMetadataEvent.hpp" #include "events/RequestObjectEvent.hpp" diff --git a/src/engine/events/DestroyEvent.cpp b/src/engine/events/DeleteEvent.cpp index 2a2e4abd..21058546 100644 --- a/src/engine/events/DestroyEvent.cpp +++ b/src/engine/events/DeleteEvent.cpp @@ -17,7 +17,7 @@ #include "raul/Maid.hpp" #include "raul/Path.hpp" -#include "DestroyEvent.hpp" +#include "DeleteEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" #include "PatchImpl.hpp" @@ -38,7 +38,7 @@ namespace Ingen { using namespace Shared; -DestroyEvent::DestroyEvent(Engine& engine, SharedPtr<Responder> responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path) +DeleteEvent::DeleteEvent(Engine& engine, SharedPtr<Responder> responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path) : QueuedEvent(engine, responder, time, true, source) , _path(path) , _store_iterator(engine.engine_store()->end()) @@ -53,14 +53,14 @@ DestroyEvent::DestroyEvent(Engine& engine, SharedPtr<Responder> responder, Frame } -DestroyEvent::~DestroyEvent() +DeleteEvent::~DeleteEvent() { delete _disconnect_event; } void -DestroyEvent::pre_process() +DeleteEvent::pre_process() { _store_iterator = _engine.engine_store()->find(_path); @@ -120,7 +120,7 @@ DestroyEvent::pre_process() void -DestroyEvent::execute(ProcessContext& context) +DeleteEvent::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -169,7 +169,7 @@ DestroyEvent::execute(ProcessContext& context) void -DestroyEvent::post_process() +DeleteEvent::post_process() { if (!_node && !_port) { if (_path.is_root()) { diff --git a/src/engine/events/DestroyEvent.hpp b/src/engine/events/DeleteEvent.hpp index 25d0b65b..d0fa43f1 100644 --- a/src/engine/events/DestroyEvent.hpp +++ b/src/engine/events/DeleteEvent.hpp @@ -37,15 +37,22 @@ class DisconnectAllEvent; class CompiledPatch; -/** An event to remove and delete a Node. +/** Delete a graph object. + * WebDAV method DELETE (RFC4918 S9.6). * * \ingroup engine */ -class DestroyEvent : public QueuedEvent +class DeleteEvent : public QueuedEvent { public: - DestroyEvent(Engine& engine, SharedPtr<Responder> responder, FrameTime timestamp, QueuedEventSource* source, const Raul::Path& path); - ~DestroyEvent(); + DeleteEvent( + Engine& engine, + SharedPtr<Responder> responder, + FrameTime timestamp, + QueuedEventSource* source, + const Raul::Path& path); + + ~DeleteEvent(); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/RenameEvent.cpp b/src/engine/events/MoveEvent.cpp index 73379a0c..661bc4c1 100644 --- a/src/engine/events/RenameEvent.cpp +++ b/src/engine/events/MoveEvent.cpp @@ -21,7 +21,7 @@ #include "NodeImpl.hpp" #include "EngineStore.hpp" #include "PatchImpl.hpp" -#include "RenameEvent.hpp" +#include "MoveEvent.hpp" #include "Responder.hpp" #include "AudioDriver.hpp" #include "MidiDriver.hpp" @@ -34,7 +34,7 @@ namespace Ingen { using namespace Shared; -RenameEvent::RenameEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Path& path, const Path& new_path) +MoveEvent::MoveEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Path& path, const Path& new_path) : QueuedEvent(engine, responder, timestamp) , _old_path(path) , _new_path(new_path) @@ -45,13 +45,13 @@ RenameEvent::RenameEvent(Engine& engine, SharedPtr<Responder> responder, SampleC } -RenameEvent::~RenameEvent() +MoveEvent::~MoveEvent() { } void -RenameEvent::pre_process() +MoveEvent::pre_process() { if (!_old_path.parent().is_parent_of(_new_path)) { _error = PARENT_DIFFERS; @@ -97,7 +97,7 @@ RenameEvent::pre_process() void -RenameEvent::execute(ProcessContext& context) +MoveEvent::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -117,13 +117,13 @@ RenameEvent::execute(ProcessContext& context) void -RenameEvent::post_process() +MoveEvent::post_process() { string msg = "Unable to rename object - "; if (_error == NO_ERROR) { _responder->respond_ok(); - _engine.broadcaster()->send_rename(_old_path, _new_path); + _engine.broadcaster()->send_move(_old_path, _new_path); } else { if (_error == OBJECT_EXISTS) msg.append("Object already exists at ").append(_new_path.str()); diff --git a/src/engine/events/RenameEvent.hpp b/src/engine/events/MoveEvent.hpp index 2fa9d897..f55d70b1 100644 --- a/src/engine/events/RenameEvent.hpp +++ b/src/engine/events/MoveEvent.hpp @@ -27,15 +27,21 @@ namespace Ingen { class PatchImpl; -/** An event to change the name of an GraphObjectImpl. +/** Move a graph object to a new path. + * WebDAV method MOVE (RFC4918 S9.9). * * \ingroup engine */ -class RenameEvent : public QueuedEvent +class MoveEvent : public QueuedEvent { public: - RenameEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Raul::Path& old_path, const Raul::Path& new_path); - ~RenameEvent(); + MoveEvent( + Engine& engine, + SharedPtr<Responder> responder, + SampleCount timestamp, + const Raul::Path& old_path, + const Raul::Path& new_path); + ~MoveEvent(); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/wscript b/src/engine/wscript index 4365cfa9..157708e8 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -54,29 +54,29 @@ def build(bld): obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' - events/SetPortValueEvent.cpp - QueuedEventSource.cpp QueuedEngineInterface.cpp + QueuedEventSource.cpp events/AllNotesOffEvent.cpp events/ClearPatchEvent.cpp events/ConnectionEvent.cpp events/CreateNodeEvent.cpp events/CreatePatchEvent.cpp events/CreatePortEvent.cpp - events/DestroyEvent.cpp + events/DeleteEvent.cpp events/DisconnectAllEvent.cpp events/DisconnectionEvent.cpp events/LoadPluginsEvent.cpp events/MidiLearnEvent.cpp + events/MoveEvent.cpp events/NoteEvent.cpp events/RegisterClientEvent.cpp - events/RenameEvent.cpp events/RequestAllObjectsEvent.cpp events/RequestMetadataEvent.cpp events/RequestObjectEvent.cpp events/RequestPluginEvent.cpp events/RequestPluginsEvent.cpp events/SetMetadataEvent.cpp + events/SetPortValueEvent.cpp events/UnregisterClientEvent.cpp ''' obj.export_incdirs = ['.'] diff --git a/src/gui/BreadCrumbBox.cpp b/src/gui/BreadCrumbBox.cpp index 0213e84e..4fab5628 100644 --- a/src/gui/BreadCrumbBox.cpp +++ b/src/gui/BreadCrumbBox.cpp @@ -199,7 +199,7 @@ BreadCrumbBox::object_destroyed(const Path& path) void -BreadCrumbBox::object_renamed(const Path& old_path, const Path& new_path) +BreadCrumbBox::object_moved(const Path& old_path, const Path& new_path) { for (std::list<BreadCrumb*>::iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) { if ((*i)->path() == old_path) diff --git a/src/gui/BreadCrumbBox.hpp b/src/gui/BreadCrumbBox.hpp index d8084b66..6938c154 100644 --- a/src/gui/BreadCrumbBox.hpp +++ b/src/gui/BreadCrumbBox.hpp @@ -56,7 +56,7 @@ private: void breadcrumb_clicked(BreadCrumb* crumb); void object_destroyed(const Raul::Path& path); - void object_renamed(const Raul::Path& old_path, const Raul::Path& new_path); + void object_moved(const Raul::Path& old_path, const Raul::Path& new_path); Raul::Path _active_path; Raul::Path _full_path; diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 74276301..74f3bc9e 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -54,7 +54,7 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode node->signal_removed_port.connect(sigc::hide_return(sigc::mem_fun(this, &NodeModule::remove_port))); node->signal_variable.connect(sigc::mem_fun(this, &NodeModule::set_property)); node->signal_property.connect(sigc::mem_fun(this, &NodeModule::set_property)); - node->signal_renamed.connect(sigc::mem_fun(this, &NodeModule::rename)); + node->signal_moved.connect(sigc::mem_fun(this, &NodeModule::rename)); } diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 88614264..6096ec7c 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -98,7 +98,7 @@ ObjectMenu::variable_changed(const URI& predicate, const Atom& value) void ObjectMenu::on_menu_destroy() { - App::instance().engine()->destroy(_object->path()); + App::instance().engine()->del(_object->path()); } diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 9f676303..6bc9cbad 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -596,11 +596,11 @@ PatchCanvas::destroy_selection() for (list<boost::shared_ptr<Item> >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) { boost::shared_ptr<NodeModule> module = boost::dynamic_pointer_cast<NodeModule>(*m); if (module) { - App::instance().engine()->destroy(module->node()->path()); + App::instance().engine()->del(module->node()->path()); } else { boost::shared_ptr<PatchPortModule> port_module = boost::dynamic_pointer_cast<PatchPortModule>(*m); if (port_module) - App::instance().engine()->destroy(port_module->port()->path()); + App::instance().engine()->del(port_module->port()->path()); } } } diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 8c271d81..efbbd78f 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -219,7 +219,7 @@ PatchTreeWindow::patch_variable_changed(const URI& key, const Atom& value, const void -PatchTreeWindow::patch_renamed(const Path& old_path, const Path& new_path) +PatchTreeWindow::patch_moved(const Path& old_path, const Path& new_path) { _enable_signal = false; diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index 12c37378..915b11d4 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -47,7 +47,7 @@ public: void new_object(SharedPtr<Client::ObjectModel> object); void patch_variable_changed(const Raul::URI& key, const Raul::Atom& value, const Raul::Path& path); - void patch_renamed(const Raul::Path& old_path, const Raul::Path& new_path); + void patch_moved(const Raul::Path& old_path, const Raul::Path& new_path); void add_patch(SharedPtr<Client::PatchModel> pm); void remove_patch(const Raul::Path& path); diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 8ae512d9..6283df86 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -55,7 +55,7 @@ Port::Port( delete _menu; _menu = NULL; - pm->signal_renamed.connect(sigc::mem_fun(this, &Port::renamed)); + pm->signal_moved.connect(sigc::mem_fun(this, &Port::moved)); if (pm->type().is_control()) { set_toggled(pm->is_toggle()); @@ -97,7 +97,7 @@ Port::create_menu() void -Port::renamed() +Port::moved() { set_name(model()->path().name()); module().lock()->resize(); diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index cdd64f0a..763cfd7b 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -60,7 +60,7 @@ private: void variable_changed(const Raul::URI& key, const Raul::Atom& value); - void renamed(); + void moved(); WeakPtr<PortModel> _port_model; bool _flipped; diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 9819bfac..a13ffd48 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -121,7 +121,7 @@ RenameWindow::ok_clicked() assert(name.length() > 0); assert(name.find("/") == string::npos); - App::instance().engine()->rename(_object->path(), _object->path().parent().base() + name); + App::instance().engine()->move(_object->path(), _object->path().parent().base() + name); hide(); } diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index 672a5d93..e25e7068 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -87,7 +87,7 @@ SubpatchModule::show_dialog() void SubpatchModule::menu_remove() { - App::instance().engine()->destroy(_patch->path()); + App::instance().engine()->del(_patch->path()); } } // namespace GUI diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index f290de5f..3b1e2d47 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -213,7 +213,7 @@ Parser::parse_update( for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) { const Redland::Node& object = (*i)["o"]; - target->destroy(object.to_string()); + target->del(object.to_string()); } // Variable settings diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp index e553364b..c7e08269 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/shared/ClashAvoider.cpp @@ -151,10 +151,10 @@ ClashAvoider::put(const Raul::Path& path, void -ClashAvoider::rename(const Raul::Path& old_path, - const Raul::Path& new_path) +ClashAvoider::move(const Raul::Path& old_path, + const Raul::Path& new_path) { - _target.rename(map_path(old_path), map_path(new_path)); + _target.move(map_path(old_path), map_path(new_path)); } @@ -210,9 +210,9 @@ ClashAvoider::set_voice_value(const Raul::Path& port_path, void -ClashAvoider::destroy(const Raul::Path& path) +ClashAvoider::del(const Raul::Path& path) { - _target.destroy(map_path(path)); + _target.del(map_path(path)); } diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp index 007331bc..2fc4b13b 100644 --- a/src/shared/ClashAvoider.hpp +++ b/src/shared/ClashAvoider.hpp @@ -51,8 +51,8 @@ public: virtual void put(const Raul::Path& path, const Resource::Properties& properties); - virtual void rename(const Raul::Path& old_path, - const Raul::Path& new_path); + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); virtual void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); @@ -75,7 +75,7 @@ public: uint32_t voice, const Raul::Atom& value); - virtual void destroy(const Raul::Path& path); + virtual void del(const Raul::Path& path); virtual void clear_patch(const Raul::Path& patch_path); |