summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-06 14:48:26 +0000
committerDavid Robillard <d@drobilla.net>2011-10-06 14:48:26 +0000
commit5994178571afa3483d2a52ce78646d4161153ea5 (patch)
tree10c2943cc754807833aad6a1f9a19fb94c4d22f5 /src/server/events
parent37e686ac346bdb77386dc3f7307ff956d40f2643 (diff)
downloadingen-5994178571afa3483d2a52ce78646d4161153ea5.tar.gz
ingen-5994178571afa3483d2a52ce78646d4161153ea5.tar.bz2
ingen-5994178571afa3483d2a52ce78646d4161153ea5.zip
Simpler providers/dependants implementation.
Raul::List is no longer necessary here since these lists are only accessed in the pre-processing thread. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3531 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.cpp4
-rw-r--r--src/server/events/CreatePort.cpp1
-rw-r--r--src/server/events/Disconnect.cpp12
3 files changed, 8 insertions, 9 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index da7aa593..39438d43 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -141,8 +141,8 @@ Connect::pre_process()
provider...
*/
if (src_node != dst_node && src_node->parent() == dst_node->parent()) {
- dst_node->providers()->push_back(new Raul::List<NodeImpl*>::Node(src_node));
- src_node->dependants()->push_back(new Raul::List<NodeImpl*>::Node(dst_node));
+ dst_node->providers().push_back(src_node);
+ src_node->dependants().push_back(dst_node);
}
_patch->add_connection(_connection);
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index c6d7c296..84a8e2d3 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -17,7 +17,6 @@
#include "raul/Array.hpp"
#include "raul/Atom.hpp"
-#include "raul/List.hpp"
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
#include "shared/LV2URIMap.hpp"
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index de078c3f..c55ae1ae 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -75,18 +75,18 @@ Disconnect::Impl::Impl(Engine& e,
NodeImpl* const src_node = _src_output_port->parent_node();
NodeImpl* const dst_node = _dst_input_port->parent_node();
- for (Raul::List<NodeImpl*>::iterator i = dst_node->providers()->begin();
- i != dst_node->providers()->end(); ++i) {
+ for (std::list<NodeImpl*>::iterator i = dst_node->providers().begin();
+ i != dst_node->providers().end(); ++i) {
if ((*i) == src_node) {
- delete dst_node->providers()->erase(i);
+ dst_node->providers().erase(i);
break;
}
}
- for (Raul::List<NodeImpl*>::iterator i = src_node->dependants()->begin();
- i != src_node->dependants()->end(); ++i) {
+ for (std::list<NodeImpl*>::iterator i = src_node->dependants().begin();
+ i != src_node->dependants().end(); ++i) {
if ((*i) == dst_node) {
- delete src_node->dependants()->erase(i);
+ src_node->dependants().erase(i);
break;
}
}