summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-03-12 18:13:03 +0000
committerDavid Robillard <d@drobilla.net>2007-03-12 18:13:03 +0000
commitcd3dffb1d8838e813cfbf58d27e212db7f8eb0af (patch)
tree62ab746043feb0e70c3335c548c7fdc1d741a31c /src/libs
parent6d03649eb75291abf2900a062ed0b7dcdb5dca86 (diff)
downloadingen-cd3dffb1d8838e813cfbf58d27e212db7f8eb0af.tar.gz
ingen-cd3dffb1d8838e813cfbf58d27e212db7f8eb0af.tar.bz2
ingen-cd3dffb1d8838e813cfbf58d27e212db7f8eb0af.zip
Removed name-based interface for FlowCanvas (using the view as a model = evil), related performance improvements (especially for Machina).
Updates for FlowCanvas API changes. Machina SMF import performance improvements (temporarily disabled node labels). git-svn-id: http://svn.drobilla.net/lad/ingen@356 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/client/PatchModel.cpp4
-rw-r--r--src/libs/client/PatchModel.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp
index ea625532..94cb3ded 100644
--- a/src/libs/client/PatchModel.cpp
+++ b/src/libs/client/PatchModel.cpp
@@ -135,9 +135,9 @@ PatchModel::remove_node(SharedPtr<NodeModel> nm)
SharedPtr<ConnectionModel> cm = (*j);
if (cm->src_port_path().parent() == nm->path()
|| cm->dst_port_path().parent() == nm->path()) {
+ removed_connection_sig.emit(cm);
_connections.erase(j); // cuts our reference
assert(!get_connection(cm->src_port_path(), cm->dst_port_path())); // no duplicates
- removed_connection_sig.emit(cm->src_port_path(), cm->dst_port_path());
}
j = next;
}
@@ -276,9 +276,9 @@ PatchModel::remove_connection(const string& src_port_path, const string& dst_por
for (list<SharedPtr<ConnectionModel> >::iterator i = _connections.begin(); i != _connections.end(); ++i) {
SharedPtr<ConnectionModel> cm = (*i);
if (cm->src_port_path() == src_port_path && cm->dst_port_path() == dst_port_path) {
+ removed_connection_sig.emit(cm);
_connections.erase(i); // cuts our reference
assert(!get_connection(src_port_path, dst_port_path)); // no duplicates
- removed_connection_sig.emit(src_port_path, dst_port_path);
return;
}
}
diff --git a/src/libs/client/PatchModel.h b/src/libs/client/PatchModel.h
index efe47e8e..c38d83a5 100644
--- a/src/libs/client/PatchModel.h
+++ b/src/libs/client/PatchModel.h
@@ -57,9 +57,9 @@ public:
sigc::signal<void, SharedPtr<NodeModel> > new_node_sig;
sigc::signal<void, SharedPtr<NodeModel> > removed_node_sig;
sigc::signal<void, SharedPtr<ConnectionModel> > new_connection_sig;
- sigc::signal<void, const Path&, const Path& > removed_connection_sig;
- sigc::signal<void> enabled_sig;
- sigc::signal<void> disabled_sig;
+ sigc::signal<void, SharedPtr<ConnectionModel> > removed_connection_sig;
+ sigc::signal<void> enabled_sig;
+ sigc::signal<void> disabled_sig;
private:
friend class Store;