X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=9613aaccb50d193e42e063479e8204daf9d3a0e3;hb=d8e93be2ee68fc6a18a7ca17d36ffc67c94207b3;hp=911dad86cdc53cce3ccf3f9a0ee2126b7cc953a2;hpb=a1d6986240db904d4fae0e77d6079d89658bb229;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 911dad86cd..9613aaccb5 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -21,7 +21,6 @@ #include #include -#include #include "ardour/utils.h" #include "ardour/configuration.h" @@ -44,11 +43,12 @@ using namespace Gtk; using namespace Gtkmm2ext; LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) - : location(0), session(0), + : SessionHandlePtr (0), /* explicitly set below */ + location(0), item_table (1, 6, false), - start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true), - end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true), - length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, true), + start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true, false), + end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true, false), + length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, false, true), cd_check_button (_("CD")), hide_check_button (_("Hide")), scms_check_button (_("SCMS")), @@ -106,11 +106,11 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) cd_track_details_hbox.pack_start (composer_label, false, false); cd_track_details_hbox.pack_start (composer_entry, true, true); - isrc_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); - performer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::performer_entry_changed)); - composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed)); - scms_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::scms_toggled)); - preemph_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::preemph_toggled)); + isrc_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::isrc_entry_changed)); + performer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::performer_entry_changed)); + composer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::composer_entry_changed)); + scms_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::scms_toggled)); + preemph_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::preemph_toggled)); set_session (sess); @@ -121,24 +121,24 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0); - start_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart)); - start_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocStart)); - start_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocStart)); + start_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart)); + start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart)); + start_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocStart)); // end_hbox.pack_start (end_go_button, false, false); end_hbox.pack_start (end_clock, false, false); - end_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); - end_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocEnd)); - end_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocEnd)); + end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); + end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd)); + end_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocEnd)); - length_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocLength)); - length_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocLength)); + length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength)); + length_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocLength)); - cd_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::cd_toggled)); - hide_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::hide_toggled)); + cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled)); + hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled)); - remove_button.signal_clicked().connect(mem_fun(*this, &LocationEditRow::remove_button_pressed)); + remove_button.signal_clicked().connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed)); pack_start(item_table, true, true); @@ -149,24 +149,22 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) LocationEditRow::~LocationEditRow() { if (location) { - start_changed_connection.disconnect(); - end_changed_connection.disconnect(); - name_changed_connection.disconnect(); - changed_connection.disconnect(); - flags_changed_connection.disconnect(); + connections.drop_connections (); } } void LocationEditRow::set_session (Session *sess) { - session = sess; + SessionHandlePtr::set_session (sess); - if (!session) return; + if (!_session) { + return; + } - start_clock.set_session (session); - end_clock.set_session (session); - length_clock.set_session (session); + start_clock.set_session (_session); + end_clock.set_session (_session); + length_clock.set_session (_session); } @@ -184,11 +182,7 @@ void LocationEditRow::set_location (Location *loc) { if (location) { - start_changed_connection.disconnect(); - end_changed_connection.disconnect(); - name_changed_connection.disconnect(); - changed_connection.disconnect(); - flags_changed_connection.disconnect(); + connections.drop_connections (); } location = loc; @@ -217,7 +211,7 @@ LocationEditRow::set_location (Location *loc) name_entry.set_text (location->name()); name_entry.set_size_request (100, -1); name_entry.set_editable (true); - name_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::name_entry_changed)); + name_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::name_entry_changed)); if (!name_entry.get_parent()) { item_table.attach (name_entry, 0, 1, 0, 1, FILL | EXPAND, FILL, 4, 0); @@ -231,14 +225,14 @@ LocationEditRow::set_location (Location *loc) item_table.attach (remove_button, 6, 7, 0, 1, FILL, FILL, 4, 0); } - if (location->is_end() || location->is_start()) { + if (location->is_session_range()) { remove_button.set_sensitive (false); } cd_check_button.set_active (location->is_cd_marker()); cd_check_button.show(); - if (location->start() == session->current_start_frame()) { + if (location->start() == _session->current_start_frame()) { cd_check_button.set_sensitive (false); } else { cd_check_button.set_sensitive (true); @@ -265,18 +259,18 @@ LocationEditRow::set_location (Location *loc) end_clock.show(); length_clock.show(); - ARDOUR_UI::instance()->tooltips().set_tip (end_go_button, _("Jump to the end of this range")); - ARDOUR_UI::instance()->tooltips().set_tip (start_go_button, _("Jump to the start of this range")); - ARDOUR_UI::instance()->tooltips().set_tip (remove_button, _("Forget this range")); - ARDOUR_UI::instance()->tooltips().set_tip (start_clock, _("Start time")); - ARDOUR_UI::instance()->tooltips().set_tip (end_clock, _("End time")); - ARDOUR_UI::instance()->tooltips().set_tip (length_clock, _("Length")); + ARDOUR_UI::instance()->set_tip (end_go_button, _("Jump to the end of this range")); + ARDOUR_UI::instance()->set_tip (start_go_button, _("Jump to the start of this range")); + ARDOUR_UI::instance()->set_tip (remove_button, _("Forget this range")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Start time")); + ARDOUR_UI::instance()->set_tip (end_clock, _("End time")); + ARDOUR_UI::instance()->set_tip (length_clock, _("Length")); } else { - ARDOUR_UI::instance()->tooltips().set_tip (start_go_button, _("Jump to this marker")); - ARDOUR_UI::instance()->tooltips().set_tip (remove_button, _("Forget this marker")); - ARDOUR_UI::instance()->tooltips().set_tip (start_clock, _("Position")); + ARDOUR_UI::instance()->set_tip (start_go_button, _("Jump to this marker")); + ARDOUR_UI::instance()->set_tip (remove_button, _("Forget this marker")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Position")); end_go_button.hide(); end_clock.hide(); @@ -287,17 +281,17 @@ LocationEditRow::set_location (Location *loc) end_clock.set_sensitive (!location->locked()); length_clock.set_sensitive (!location->locked()); - start_changed_connection = location->start_changed.connect (mem_fun(*this, &LocationEditRow::start_changed)); - end_changed_connection = location->end_changed.connect (mem_fun(*this, &LocationEditRow::end_changed)); - name_changed_connection = location->name_changed.connect (mem_fun(*this, &LocationEditRow::name_changed)); - changed_connection = location->changed.connect (mem_fun(*this, &LocationEditRow::location_changed)); - flags_changed_connection = location->FlagsChanged.connect (mem_fun(*this, &LocationEditRow::flags_changed)); + location->start_changed.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::start_changed, this, _1), gui_context()); + location->end_changed.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::end_changed, this, _1), gui_context()); + location->name_changed.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::name_changed, this, _1), gui_context()); + location->changed.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::location_changed, this, _1), gui_context()); + location->FlagsChanged.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::flags_changed, this, _1, _2), gui_context()); } void LocationEditRow::name_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::name_entry_changed)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed) if (i_am_the_modifier || !location) return; location->set_name (name_entry.get_text()); @@ -307,7 +301,7 @@ LocationEditRow::name_entry_changed () void LocationEditRow::isrc_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::isrc_entry_changed)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::isrc_entry_changed) if (i_am_the_modifier || !location) return; @@ -323,7 +317,7 @@ LocationEditRow::isrc_entry_changed () void LocationEditRow::performer_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::performer_entry_changed)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::performer_entry_changed) if (i_am_the_modifier || !location) return; @@ -337,7 +331,7 @@ LocationEditRow::performer_entry_changed () void LocationEditRow::composer_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::composer_entry_changed)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::composer_entry_changed) if (i_am_the_modifier || !location) return; @@ -406,7 +400,7 @@ LocationEditRow::cd_toggled () //} if (cd_check_button.get_active()) { - if (location->start() <= session->current_start_frame()) { + if (location->start() <= _session->current_start_frame()) { error << _("You cannot put a CD marker at the start of the session") << endmsg; cd_check_button.set_active (false); return; @@ -458,9 +452,11 @@ LocationEditRow::hide_toggled () void LocationEditRow::remove_button_pressed () { - if (!location) return; + if (!location) { + return; + } - remove_requested(location); /* EMIT_SIGNAL */ + remove_requested (location); /* EMIT_SIGNAL */ } @@ -493,7 +489,7 @@ LocationEditRow::preemph_toggled () void LocationEditRow::end_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::end_changed), loc)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) if (!location) return; @@ -509,7 +505,7 @@ LocationEditRow::end_changed (ARDOUR::Location *loc) void LocationEditRow::start_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::start_changed), loc)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::start_changed, loc) if (!location) return; @@ -518,7 +514,7 @@ LocationEditRow::start_changed (ARDOUR::Location *loc) start_clock.set (location->start()); - if (location->start() == session->current_start_frame()) { + if (location->start() == _session->current_start_frame()) { cd_check_button.set_sensitive (false); } else { cd_check_button.set_sensitive (true); @@ -530,7 +526,7 @@ LocationEditRow::start_changed (ARDOUR::Location *loc) void LocationEditRow::name_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::name_changed), loc)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::name_changed, loc) if (!location) return; @@ -547,7 +543,7 @@ LocationEditRow::name_changed (ARDOUR::Location *loc) void LocationEditRow::location_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::location_changed), loc)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::location_changed, loc) if (!location) return; @@ -568,7 +564,7 @@ LocationEditRow::location_changed (ARDOUR::Location *loc) void LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::flags_changed), loc, src)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::flags_changed, loc, src) if (!location) return; @@ -587,8 +583,7 @@ LocationEditRow::focus_name() { LocationUI::LocationUI () - : session (0) - , add_location_button (_("New Marker")) + : add_location_button (_("New Marker")) , add_range_button (_("New Range")) { i_am_the_modifier = 0; @@ -659,8 +654,8 @@ LocationUI::LocationUI () pack_start (location_vpacker, true, true); - add_location_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_location)); - add_range_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_range)); + add_location_button.signal_clicked().connect (sigc::mem_fun(*this, &LocationUI::add_new_location)); + add_range_button.signal_clicked().connect (sigc::mem_fun(*this, &LocationUI::add_new_range)); show_all (); } @@ -677,16 +672,16 @@ LocationUI::do_location_remove (ARDOUR::Location *loc) cannot be removed. */ - if (loc->is_end()) { + if (loc->is_session_range()) { return FALSE; } - session->begin_reversible_command (_("remove marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->remove (loc); - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _session->begin_reversible_command (_("remove marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->remove (loc); + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); return FALSE; } @@ -697,7 +692,7 @@ LocationUI::location_remove_requested (ARDOUR::Location *loc) // must do this to prevent problems when destroying // the effective sender of this event - Glib::signal_idle().connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc)); + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &LocationUI::do_location_remove), loc)); } @@ -711,15 +706,13 @@ LocationUI::location_redraw_ranges () void LocationUI::location_added (Location* location) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_added), location)); + ENSURE_GUI_THREAD (*this, &LocationUI::location_added, location) if (location->is_auto_punch()) { punch_edit_row.set_location(location); - } - else if (location->is_auto_loop()) { + } else if (location->is_auto_loop()) { loop_edit_row.set_location(location); - } - else { + } else { refresh_location_list (); } } @@ -727,16 +720,21 @@ LocationUI::location_added (Location* location) void LocationUI::location_removed (Location* location) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_removed), location)); + ENSURE_GUI_THREAD (*this, &LocationUI::location_removed, location) if (location->is_auto_punch()) { punch_edit_row.set_location(0); - } - else if (location->is_auto_loop()) { + } else if (location->is_auto_loop()) { loop_edit_row.set_location(0); - } - else { - refresh_location_list (); + } else if (location->is_range_marker() || location->is_mark()) { + Box_Helpers::BoxList& children = location->is_range_marker() ? range_rows.children () : location_rows.children (); + for (Box_Helpers::BoxList::iterator i = children.begin(); i != children.end(); ++i) { + LocationEditRow* r = dynamic_cast (i->get_widget()); + if (r && r->get_location() == location) { + children.erase (i); + break; + } + } } } @@ -750,7 +748,6 @@ void LocationUI::map_locations (Locations::LocationList& locations) { Locations::LocationList::iterator i; - Location* location; gint n; int mark_n = 0; Locations::LocationList temp = locations; @@ -759,38 +756,32 @@ LocationUI::map_locations (Locations::LocationList& locations) temp.sort (cmp); locations = temp; - Box_Helpers::BoxList & loc_children = location_rows.children(); - Box_Helpers::BoxList & range_children = range_rows.children(); - LocationEditRow * erow; - for (n = 0, i = locations.begin(); i != locations.end(); ++n, ++i) { - location = *i; + Location* location = *i; if (location->is_mark()) { - mark_n++; - erow = manage (new LocationEditRow(session, location, mark_n)); - erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested)); - erow->redraw_ranges.connect (mem_fun(*this, &LocationUI::location_redraw_ranges)); + LocationEditRow* erow = manage (new LocationEditRow (_session, location, mark_n)); + erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested)); + erow->redraw_ranges.connect (sigc::mem_fun(*this, &LocationUI::location_redraw_ranges)); + Box_Helpers::BoxList & loc_children = location_rows.children(); loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START)); if (location == newest_location) { newest_location = 0; erow->focus_name(); } - } - else if (location->is_auto_punch()) { - punch_edit_row.set_session (session); + } else if (location->is_auto_punch()) { + punch_edit_row.set_session (_session); punch_edit_row.set_location (location); punch_edit_row.show_all(); - } - else if (location->is_auto_loop()) { - loop_edit_row.set_session (session); + } else if (location->is_auto_loop()) { + loop_edit_row.set_session (_session); loop_edit_row.set_location (location); loop_edit_row.show_all(); - } - else { - erow = manage (new LocationEditRow(session, location)); - erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested)); + } else { + LocationEditRow* erow = manage (new LocationEditRow(_session, location)); + erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested)); + Box_Helpers::BoxList & range_children = range_rows.children(); range_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START)); } } @@ -804,19 +795,19 @@ LocationUI::add_new_location() { string markername; - if (session) { - nframes_t where = session->audible_frame(); - session->locations()->next_available_name(markername,"mark"); + if (_session) { + nframes_t where = _session->audible_frame(); + _session->locations()->next_available_name(markername,"mark"); Location *location = new Location (where, where, markername, Location::IsMark); if (Config->get_name_new_markers()) { newest_location = location; } - session->begin_reversible_command (_("add marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _session->begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (location, true); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } } @@ -826,32 +817,23 @@ LocationUI::add_new_range() { string rangename; - if (session) { - nframes_t where = session->audible_frame(); - session->locations()->next_available_name(rangename,"unnamed"); + if (_session) { + nframes_t where = _session->audible_frame(); + _session->locations()->next_available_name(rangename,"unnamed"); Location *location = new Location (where, where, rangename, Location::IsRangeMarker); - session->begin_reversible_command (_("add range marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _session->begin_reversible_command (_("add range marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (location, true); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } } - -void -LocationUI::refresh_location_list_s (Change ignored) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::refresh_location_list_s), ignored)); - - refresh_location_list (); -} - void LocationUI::refresh_location_list () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list)); + ENSURE_GUI_THREAD (*this, &LocationUI::refresh_location_list) using namespace Box_Helpers; // this is just too expensive to do when window is not shown @@ -863,8 +845,8 @@ LocationUI::refresh_location_list () loc_children.clear(); range_children.clear(); - if (session) { - session->locations()->apply (*this, &LocationUI::map_locations); + if (_session) { + _session->locations()->apply (*this, &LocationUI::map_locations); } } @@ -872,22 +854,36 @@ LocationUI::refresh_location_list () void LocationUI::set_session(ARDOUR::Session* s) { - session = s; + SessionHandlePtr::set_session (s); - if (session) { - session->locations()->changed.connect (mem_fun(*this, &LocationUI::refresh_location_list)); - session->locations()->StateChanged.connect (mem_fun(*this, &LocationUI::refresh_location_list_s)); - session->locations()->added.connect (mem_fun(*this, &LocationUI::location_added)); - session->locations()->removed.connect (mem_fun(*this, &LocationUI::location_removed)); - session->GoingAway.connect (mem_fun(*this, &LocationUI::session_gone)); + if (_session) { + _session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::locations_changed, this, _1), gui_context()); + _session->locations()->StateChanged.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::refresh_location_list, this), gui_context()); + _session->locations()->added.connect (_session_connections, invalidator (*this), ui_bind (&LocationUI::location_added, this, _1), gui_context()); + _session->locations()->removed.connect (_session_connections, invalidator (*this), ui_bind (&LocationUI::location_removed, this, _1), gui_context()); } + + loop_edit_row.set_session (s); + punch_edit_row.set_session (s); + refresh_location_list (); } void -LocationUI::session_gone() +LocationUI::locations_changed (Locations::Change c) { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::session_gone)); + /* removal is signalled by both a removed and a changed signal emission from Locations, + so we don't need to refresh the list on a removal + */ + if (c != Locations::REMOVAL) { + refresh_location_list (); + } +} + +void +LocationUI::session_going_away() +{ + ENSURE_GUI_THREAD (*this, &LocationUI::session_going_away); using namespace Box_Helpers; BoxList & loc_children = location_rows.children(); @@ -901,14 +897,15 @@ LocationUI::session_gone() punch_edit_row.set_session (0); punch_edit_row.set_location (0); + + SessionHandlePtr::session_going_away (); } /*------------------------*/ LocationUIWindow::LocationUIWindow () - : ArdourDialog ("locations dialog") + : ArdourDialog (_("Locations")) { - set_title (_("Locations")); set_wmclass(X_("ardour_locations"), "Ardour"); set_name ("LocationWindow"); @@ -938,13 +935,11 @@ LocationUIWindow::set_session (Session *s) { ArdourDialog::set_session (s); _ui.set_session (s); - - s->GoingAway.connect (mem_fun (*this, &LocationUIWindow::session_gone)); } void -LocationUIWindow::session_gone () +LocationUIWindow::session_going_away () { + ArdourDialog::session_going_away (); hide_all(); - ArdourDialog::session_gone (); }