From df1447c665e6c3631961297a9d3e9aff4e94c47f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 12 Jan 2013 23:38:03 +0000 Subject: Remove Raul::SharedPtr and switch to std::shared_ptr. Use project local short type aliases for shared_ptr and friends. Move Raul::Disposable and Raul::Manageable into Raul::Maid. Use sets to store machina nodes and edges to avoid O(n) searches. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/ControlBindings.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/ControlBindings.cpp') diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 25d49265..634c568a 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -350,13 +350,13 @@ ControlBindings::bind(ProcessContext& context, Key key) return true; } -SharedPtr +SPtr ControlBindings::remove(const Raul::Path& path) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - SharedPtr old_bindings(_bindings); - SharedPtr copy(new Bindings(*_bindings.get())); + SPtr old_bindings(_bindings); + SPtr copy(new Bindings(*_bindings.get())); for (Bindings::iterator i = copy->begin(); i != copy->end();) { Bindings::iterator next = i; @@ -372,13 +372,13 @@ ControlBindings::remove(const Raul::Path& path) return old_bindings; } -SharedPtr +SPtr ControlBindings::remove(PortImpl* port) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - SharedPtr old_bindings(_bindings); - SharedPtr copy(new Bindings(*_bindings.get())); + SPtr old_bindings(_bindings); + SPtr copy(new Bindings(*_bindings.get())); for (Bindings::iterator i = copy->begin(); i != copy->end();) { Bindings::iterator next = i; @@ -397,8 +397,8 @@ ControlBindings::remove(PortImpl* port) void ControlBindings::pre_process(ProcessContext& context, Buffer* buffer) { - uint16_t value = 0; - SharedPtr bindings = _bindings; + uint16_t value = 0; + SPtr bindings = _bindings; _feedback->clear(); Ingen::World* world = context.engine().world(); -- cgit v1.2.1