From 6a971e645dba4458e0f82ee82dba409fe0a64d41 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 19 Sep 2014 22:50:50 -0400 Subject: use new ARDOUR::Location signals in GUI Conflicts: gtk2_ardour/editor_markers.cc --- gtk2_ardour/location_ui.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gtk2_ardour/location_ui.cc') diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index f4a9b7ea07..538d7315bd 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -336,13 +336,15 @@ LocationEditRow::set_location (Location *loc) --i_am_the_modifier; - location->start_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::start_changed, this, _1), gui_context()); - location->end_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::end_changed, this, _1), gui_context()); - location->name_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::name_changed, this, _1), gui_context()); - location->changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this, _1), gui_context()); - location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this, _1, _2), gui_context()); - location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this, _1), gui_context()); - location->PositionLockStyleChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::position_lock_style_changed, this, _1), gui_context()); + /* connect to per-location signals, since this row only cares about this location */ + + location->NameChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::name_changed, this), gui_context()); + location->StartChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::start_changed, this), gui_context()); + location->EndChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::end_changed, this), gui_context()); + location->Changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this), gui_context()); + location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this), gui_context()); + location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this), gui_context()); + location->PositionLockStyleChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::position_lock_style_changed, this), gui_context()); } void @@ -589,7 +591,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *) +LocationEditRow::end_changed () { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) @@ -605,7 +607,7 @@ LocationEditRow::end_changed (ARDOUR::Location *) } void -LocationEditRow::start_changed (ARDOUR::Location*) +LocationEditRow::start_changed () { if (!location) return; @@ -624,7 +626,7 @@ LocationEditRow::start_changed (ARDOUR::Location*) } void -LocationEditRow::name_changed (ARDOUR::Location *) +LocationEditRow::name_changed () { if (!location) return; @@ -639,7 +641,7 @@ LocationEditRow::name_changed (ARDOUR::Location *) } void -LocationEditRow::location_changed (ARDOUR::Location*) +LocationEditRow::location_changed () { if (!location) return; @@ -657,7 +659,7 @@ LocationEditRow::location_changed (ARDOUR::Location*) } void -LocationEditRow::flags_changed (ARDOUR::Location*, void *) +LocationEditRow::flags_changed () { if (!location) { return; @@ -673,7 +675,7 @@ LocationEditRow::flags_changed (ARDOUR::Location*, void *) } void -LocationEditRow::lock_changed (ARDOUR::Location*) +LocationEditRow::lock_changed () { if (!location) { return; @@ -689,7 +691,7 @@ LocationEditRow::lock_changed (ARDOUR::Location*) } void -LocationEditRow::position_lock_style_changed (ARDOUR::Location*) +LocationEditRow::position_lock_style_changed () { if (!location) { return; -- cgit v1.2.3