diff options
author | David Robillard <d@drobilla.net> | 2015-02-06 22:55:30 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2015-02-06 22:55:30 +0000 |
commit | 10669b73136183f70057917af311dadad46588b7 (patch) | |
tree | 6d81c015f9ab292f5d21b219504f28fdb027630f /src/server/events/Delete.cpp | |
parent | 8fb76ad09c062055170666de28661bd9da25f98e (diff) | |
download | ingen-10669b73136183f70057917af311dadad46588b7.tar.gz ingen-10669b73136183f70057917af311dadad46588b7.tar.bz2 ingen-10669b73136183f70057917af311dadad46588b7.zip |
Remove gthread dependency from engine.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5533 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Delete.cpp')
-rw-r--r-- | src/server/events/Delete.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index 993530a8..2d324515 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -45,7 +45,7 @@ Delete::Delete(Engine& engine, , _ports_array(NULL) , _compiled_graph(NULL) , _disconnect_event(NULL) - , _lock(engine.store()->lock(), Glib::NOT_LOCK) + , _lock(engine.store()->mutex(), std::defer_lock) { if (Node::uri_is_path(uri)) { _path = Node::uri_to_path(uri); @@ -84,7 +84,7 @@ Delete::pre_process() return Event::pre_process_done(Status::INTERNAL_ERROR, _path); } - _lock.acquire(); + _lock.lock(); _engine.store()->remove(iter, _removed_objects); @@ -145,8 +145,8 @@ Delete::execute(ProcessContext& context) void Delete::post_process() { - if (_lock.locked()) { - _lock.release(); + if (_lock.owns_lock()) { + _lock.unlock(); } _removed_bindings.reset(); |