X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=5a2e11038c482c87c8a4e88c5baecd945b3fe509;hb=fe85a922ec4a3e0cf1107adadfa50ad7b8417aa3;hp=4190a2c463f84ed06a850793d364a6b8c87ce60a;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 4190a2c463..5a2e11038c 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,7 +43,8 @@ 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, false), end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true, false), @@ -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; @@ -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,11 +281,11 @@ LocationEditRow::set_location (Location *loc) end_clock.set_sensitive (!location->locked()); length_clock.set_sensitive (!location->locked()); - start_changed_connection = location->start_changed.connect (sigc::mem_fun(*this, &LocationEditRow::start_changed)); - end_changed_connection = location->end_changed.connect (sigc::mem_fun(*this, &LocationEditRow::end_changed)); - name_changed_connection = location->name_changed.connect (sigc::mem_fun(*this, &LocationEditRow::name_changed)); - changed_connection = location->changed.connect (sigc::mem_fun(*this, &LocationEditRow::location_changed)); - flags_changed_connection = location->FlagsChanged.connect (sigc::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 @@ -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; @@ -518,7 +512,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); @@ -587,8 +581,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; @@ -677,16 +670,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; } @@ -769,7 +762,7 @@ LocationUI::map_locations (Locations::LocationList& locations) if (location->is_mark()) { mark_n++; - erow = manage (new LocationEditRow(session, location, mark_n)); + 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)); loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START)); @@ -779,17 +772,17 @@ LocationUI::map_locations (Locations::LocationList& locations) } } else if (location->is_auto_punch()) { - punch_edit_row.set_session (session); + 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); + 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 = manage (new LocationEditRow(_session, location)); erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested)); range_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START)); } @@ -804,19 +797,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,28 +819,19 @@ 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 (*this, &LocationUI::refresh_location_list_s, ignored) - - refresh_location_list (); -} - void LocationUI::refresh_location_list () { @@ -863,8 +847,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 +856,25 @@ LocationUI::refresh_location_list () void LocationUI::set_session(ARDOUR::Session* s) { - session = s; + SessionHandlePtr::set_session (s); - if (session) { - session->locations()->changed.connect (sigc::mem_fun(*this, &LocationUI::refresh_location_list)); - session->locations()->StateChanged.connect (sigc::mem_fun(*this, &LocationUI::refresh_location_list_s)); - session->locations()->added.connect (sigc::mem_fun(*this, &LocationUI::location_added)); - session->locations()->removed.connect (sigc::mem_fun(*this, &LocationUI::location_removed)); - session->GoingAway.connect (sigc::mem_fun(*this, &LocationUI::session_gone)); + if (_session) { + _session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::refresh_location_list, this), 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::session_going_away() { - ENSURE_GUI_THREAD (*this, &LocationUI::session_gone) + ENSURE_GUI_THREAD (*this, &LocationUI::session_going_away); using namespace Box_Helpers; BoxList & loc_children = location_rows.children(); @@ -901,14 +888,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 +926,11 @@ LocationUIWindow::set_session (Session *s) { ArdourDialog::set_session (s); _ui.set_session (s); - - s->GoingAway.connect (sigc::mem_fun (*this, &LocationUIWindow::session_gone)); } void -LocationUIWindow::session_gone () +LocationUIWindow::session_going_away () { + ArdourDialog::session_going_away (); hide_all(); - ArdourDialog::session_gone (); }