summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp10
-rw-r--r--src/client/ClientStore.hpp6
-rw-r--r--src/client/HTTPEngineSender.cpp6
-rw-r--r--src/client/HTTPEngineSender.hpp6
-rw-r--r--src/client/OSCClientReceiver.cpp8
-rw-r--r--src/client/OSCClientReceiver.hpp2
-rw-r--r--src/client/OSCEngineSender.cpp8
-rw-r--r--src/client/OSCEngineSender.hpp6
-rw-r--r--src/client/ObjectModel.hpp4
-rw-r--r--src/client/SigClientInterface.hpp8
-rw-r--r--src/client/ThreadedSigClientInterface.hpp10
11 files changed, 37 insertions, 37 deletions
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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 16:20:28 +0000