summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-03-26 22:32:53 +0200
committerDavid Robillard <d@drobilla.net>2017-03-26 22:49:48 +0200
commitda33ac899a390ac13abbc6fba36d1b5c1d65d267 (patch)
tree887af451a7e9fe7d2d1aac076246b8d410747e9c /ingen
parent09a0252c938fbdc3a0329520e78586432528eda9 (diff)
downloadingen-nodeless.tar.gz
ingen-nodeless.tar.bz2
ingen-nodeless.zip
Add properties parameter to delete interfacenodeless
Diffstat (limited to 'ingen')
-rw-r--r--ingen/AtomWriter.hpp3
-rw-r--r--ingen/Interface.hpp3
-rw-r--r--ingen/Tee.hpp5
-rw-r--r--ingen/client/ClientStore.hpp3
-rw-r--r--ingen/client/SigClientInterface.hpp7
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp7
6 files changed, 18 insertions, 10 deletions
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index e7a02049..c14e70d4 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -61,7 +61,8 @@ public:
void move(const Raul::Path& old_path,
const Raul::Path& new_path);
- void del(const Raul::URI& uri);
+ void del(const Raul::URI& uri,
+ const Properties& properties = Properties());
void connect(const Raul::Path& tail,
const Raul::Path& head);
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp
index e396872e..2a580f0c 100644
--- a/ingen/Interface.hpp
+++ b/ingen/Interface.hpp
@@ -79,7 +79,8 @@ public:
virtual void move(const Raul::Path& old_path,
const Raul::Path& new_path) = 0;
- virtual void del(const Raul::URI& uri) = 0;
+ virtual void del(const Raul::URI& uri,
+ const Properties& properties = Properties()) = 0;
virtual void connect(const Raul::Path& tail,
const Raul::Path& head) = 0;
diff --git a/ingen/Tee.hpp b/ingen/Tee.hpp
index 02596e03..b2e1244e 100644
--- a/ingen/Tee.hpp
+++ b/ingen/Tee.hpp
@@ -86,7 +86,10 @@ public:
BROADCAST(move, old_path, new_path);
}
- void del(const Raul::URI& uri) { BROADCAST(del, uri); }
+ void del(const Raul::URI& uri,
+ const Properties& properties = Properties()) {
+ BROADCAST(del, uri, properties);
+ }
void connect(const Raul::Path& tail,
const Raul::Path& head) {
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 1887bed3..c3efb7c7 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -102,7 +102,8 @@ public:
void disconnect_all(const Raul::Path& graph,
const Raul::Path& path);
- void del(const Raul::URI& uri);
+ void del(const Raul::URI& uri,
+ const Properties& properties = Properties());
void undo() {}
void redo() {}
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 7e903fab..4ee3624c 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -56,7 +56,7 @@ public:
INGEN_SIGNAL(delta, void, Raul::URI, Properties, Properties, Resource::Graph)
INGEN_SIGNAL(object_copied, void, Raul::URI, Raul::URI)
INGEN_SIGNAL(object_moved, void, Raul::Path, Raul::Path)
- INGEN_SIGNAL(object_deleted, void, Raul::URI)
+ INGEN_SIGNAL(object_deleted, void, Raul::URI, Properties)
INGEN_SIGNAL(connection, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(disconnection, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(disconnect_all, void, Raul::Path, Raul::Path)
@@ -97,8 +97,9 @@ protected:
void connect(const Raul::Path& tail, const Raul::Path& head)
{ EMIT(connection, tail, head); }
- void del(const Raul::URI& uri)
- { EMIT(object_deleted, uri); }
+ void del(const Raul::URI& uri,
+ const Properties& properties = Properties())
+ { EMIT(object_deleted, uri, properties); }
void copy(const Raul::URI& old_uri, const Raul::URI& new_uri)
{ EMIT(object_copied, old_uri, new_uri); }
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 219fd8d1..d9a88eee 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -94,8 +94,9 @@ public:
void connect(const Raul::Path& tail, const Raul::Path& head)
{ push_sig(sigc::bind(connection_slot, tail, head)); }
- void del(const Raul::URI& uri)
- { push_sig(sigc::bind(object_deleted_slot, uri)); }
+ void del(const Raul::URI& uri,
+ const Properties& properties = Properties())
+ { push_sig(sigc::bind(object_deleted_slot, uri, properties)); }
void move(const Raul::Path& old_path, const Raul::Path& new_path)
{ push_sig(sigc::bind(object_moved_slot, old_path, new_path)); }
@@ -165,7 +166,7 @@ private:
sigc::slot<void, URI, Properties, Graph> put_slot;
sigc::slot<void, URI, Properties, Properties, Graph> delta_slot;
sigc::slot<void, Path, Path> connection_slot;
- sigc::slot<void, URI> object_deleted_slot;
+ sigc::slot<void, URI, Properties> object_deleted_slot;
sigc::slot<void, Path, Path> object_moved_slot;
sigc::slot<void, URI, URI> object_copied_slot;
sigc::slot<void, Path, Path> disconnection_slot;