From f90071113654c5d788e90196db5ee1dedd11172f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 24 Oct 2014 12:18:40 -0400 Subject: port changes to ARDOUR::Location and ARDOUR::Locations APIs from Tracks to Ardour. Fixes deadlocks caused by mutex on Locations list, and clarifies the purposes and uses of the class-level and object-level change-related signals. --- libs/ardour/session_state.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libs/ardour/session_state.cc') diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 6560c6004b..539facc784 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -316,10 +316,9 @@ Session::post_engine_init () initialize_latencies (); + _locations->added.connect_same_thread (*this, boost::bind (&Session::location_added, this, _1)); + _locations->removed.connect_same_thread (*this, boost::bind (&Session::location_removed, this, _1)); _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this)); - _locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1)); - - } catch (AudioEngine::PortRegistrationFailure& err) { /* handle this one in a different way than all others, so that its clear what happened */ -- cgit v1.2.3