fully implement and deploy explicit x-thread signal connection syntax (testing comes next)

git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 9 deletions

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 61a0ec1405..439d64971b 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -282,11 +282,11 @@ LocationEditRow::set_location (Location *loc)
 	end_clock.set_sensitive (!location->locked());
 	length_clock.set_sensitive (!location->locked());
 
-	location->start_changed.connect (connections, boost::bind (&LocationEditRow::start_changed, this, _1));
-	location->end_changed.connect (connections, boost::bind (&LocationEditRow::end_changed, this, _1));
-	location->name_changed.connect (connections, boost::bind (&LocationEditRow::name_changed, this, _1));
-	location->changed.connect (connections, boost::bind (&LocationEditRow::location_changed, this, _1));
-	location->FlagsChanged.connect (connections, boost::bind (&LocationEditRow::flags_changed, this, _1, _2));
+	location->start_changed.connect (connections, ui_bind (&LocationEditRow::start_changed, this, _1), gui_context());
+	location->end_changed.connect (connections, ui_bind (&LocationEditRow::end_changed, this, _1), gui_context());
+	location->name_changed.connect (connections, ui_bind (&LocationEditRow::name_changed, this, _1), gui_context());
+	location->changed.connect (connections, ui_bind (&LocationEditRow::location_changed, this, _1), gui_context());
+	location->FlagsChanged.connect (connections, ui_bind (&LocationEditRow::flags_changed, this, _1, _2), gui_context());
 }
 
 void
@@ -860,10 +860,10 @@ LocationUI::set_session(ARDOUR::Session* s)
 	SessionHandlePtr::set_session (s);
 
 	if (_session) {
-		_session->locations()->changed.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this));
-		_session->locations()->StateChanged.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this));
-		_session->locations()->added.connect (_session_connections, boost::bind (&LocationUI::location_added, this, _1));
-		_session->locations()->removed.connect (_session_connections, boost::bind (&LocationUI::location_removed, this, _1));
+		_session->locations()->changed.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this), gui_context());
+		_session->locations()->StateChanged.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this), gui_context());
+		_session->locations()->added.connect (_session_connections, ui_bind (&LocationUI::location_added, this, _1), gui_context());
+		_session->locations()->removed.connect (_session_connections, ui_bind (&LocationUI::location_removed, this, _1), gui_context());
 	}
 
 	refresh_location_list ();