From 10669b73136183f70057917af311dadad46588b7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 6 Feb 2015 22:55:30 +0000 Subject: Remove gthread dependency from engine. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5533 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/events/DisconnectAll.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/server/events/DisconnectAll.cpp') diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index ef876ffe..22560c7e 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "ingen/Store.hpp" #include "raul/Array.hpp" @@ -82,10 +81,10 @@ DisconnectAll::~DisconnectAll() bool DisconnectAll::pre_process() { - Glib::RWLock::WriterLock lock(_engine.store()->lock(), Glib::NOT_LOCK); + std::unique_lock lock(_engine.store()->mutex(), std::defer_lock); if (!_deleting) { - lock.acquire(); + lock.lock(); _parent = dynamic_cast(_engine.store()->get(_parent_path)); if (!_parent) { -- cgit v1.2.1