X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Flocation_ui.cc;h=c27dbafcc7f5dce81434aad9576732091291e70b;hb=17e6f1952e4073fb864354438fed57d5e10ec617;hp=4190a2c463f84ed06a850793d364a6b8c87ce60a;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 4190a2c463..c27dbafcc7 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" @@ -29,11 +28,12 @@ #include "pbd/memento_command.h" #include "ardour_ui.h" -#include "prompter.h" -#include "location_ui.h" +#include "clock_group.h" +#include "gui_thread.h" #include "keyboard.h" +#include "location_ui.h" +#include "prompter.h" #include "utils.h" -#include "gui_thread.h" #include "i18n.h" @@ -44,130 +44,166 @@ using namespace Gtk; using namespace Gtkmm2ext; LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) - : location(0), session(0), - item_table (1, 6, false), - 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")), - preemph_check_button (_("Pre-Emphasis")) - + : SessionHandlePtr (0) /* explicitly set below */ + , location(0) + , item_table (1, 6, false) + , start_clock (X_("locationstart"), true, "", true, false) + , start_to_playhead_button (_("Use PH")) + , end_clock (X_("locationend"), true, "", true, false) + , end_to_playhead_button (_("Use PH")) + , length_clock (X_("locationlength"), true, "", true, false, true) + , cd_check_button (_("CD")) + , hide_check_button (_("Hide")) + , lock_check_button (_("Lock")) + , glue_check_button (_("Glue")) + , _clock_group (0) { - i_am_the_modifier = 0; - - start_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR))); - end_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR))); - remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_SMALL_TOOLBAR))); - - number_label.set_name ("LocationEditNumberLabel"); - name_label.set_name ("LocationEditNameLabel"); - name_entry.set_name ("LocationEditNameEntry"); - start_go_button.set_name ("LocationEditGoButton"); - end_go_button.set_name ("LocationEditGoButton"); - cd_check_button.set_name ("LocationEditCdButton"); - hide_check_button.set_name ("LocationEditHideButton"); - remove_button.set_name ("LocationEditRemoveButton"); - isrc_label.set_name ("LocationEditNumberLabel"); - isrc_entry.set_name ("LocationEditNameEntry"); - scms_check_button.set_name ("LocationEditCdButton"); - preemph_check_button.set_name ("LocationEditCdButton"); - performer_label.set_name ("LocationEditNumberLabel"); - performer_entry.set_name ("LocationEditNameEntry"); - composer_label.set_name ("LocationEditNumberLabel"); - composer_entry.set_name ("LocationEditNameEntry"); - - isrc_label.set_text ("ISRC: "); - isrc_label.set_size_request (30, -1); - performer_label.set_text ("Performer: "); - performer_label.set_size_request (60, -1); - composer_label.set_text ("Composer: "); - composer_label.set_size_request (60, -1); - - isrc_entry.set_size_request (112, -1); - isrc_entry.set_max_length(12); - isrc_entry.set_editable (true); - - performer_entry.set_size_request (100, -1); - performer_entry.set_editable (true); - - composer_entry.set_size_request (100, -1); - composer_entry.set_editable (true); - - name_label.set_alignment (0, 0.5); - - cd_track_details_hbox.pack_start (isrc_label, false, false); - cd_track_details_hbox.pack_start (isrc_entry, false, false); - cd_track_details_hbox.pack_start (scms_check_button, false, false); - cd_track_details_hbox.pack_start (preemph_check_button, false, false); - cd_track_details_hbox.pack_start (performer_label, false, false); - cd_track_details_hbox.pack_start (performer_entry, true, true); - 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 (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); - - // start_hbox.pack_start (start_go_button, false, false); - start_hbox.pack_start (start_clock, false, false); - - /* this is always in this location, no matter what the location is */ - - item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0); - - 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(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 (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(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(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed)); - - pack_start(item_table, true, true); - - set_location (loc); - set_number (num); -} - -LocationEditRow::~LocationEditRow() -{ - if (location) { - start_changed_connection.disconnect(); - end_changed_connection.disconnect(); - name_changed_connection.disconnect(); - changed_connection.disconnect(); - flags_changed_connection.disconnect(); - } + i_am_the_modifier = 0; + + remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_MENU))); + + number_label.set_name ("LocationEditNumberLabel"); + name_label.set_name ("LocationEditNameLabel"); + name_entry.set_name ("LocationEditNameEntry"); + cd_check_button.set_name ("LocationEditCdButton"); + hide_check_button.set_name ("LocationEditHideButton"); + lock_check_button.set_name ("LocationEditLockButton"); + glue_check_button.set_name ("LocationEditGlueButton"); + remove_button.set_name ("LocationEditRemoveButton"); + isrc_label.set_name ("LocationEditNumberLabel"); + isrc_entry.set_name ("LocationEditNameEntry"); + scms_check_button.set_name ("LocationEditCdButton"); + preemph_check_button.set_name ("LocationEditCdButton"); + performer_label.set_name ("LocationEditNumberLabel"); + performer_entry.set_name ("LocationEditNameEntry"); + composer_label.set_name ("LocationEditNumberLabel"); + composer_entry.set_name ("LocationEditNameEntry"); + + isrc_label.set_text (X_("ISRC:")); + performer_label.set_text (_("Performer:")); + composer_label.set_text (_("Composer:")); + scms_label.set_text (X_("SCMS")); + preemph_label.set_text (_("Pre-Emphasis")); + + isrc_entry.set_size_request (112, -1); + isrc_entry.set_max_length(12); + isrc_entry.set_editable (true); + + performer_entry.set_size_request (100, -1); + performer_entry.set_editable (true); + + composer_entry.set_size_request (100, -1); + composer_entry.set_editable (true); + + name_label.set_alignment (0, 0.5); + + Gtk::HBox* front_spacing = manage (new HBox); + front_spacing->set_size_request (20, -1); + Gtk::HBox* mid_spacing = manage (new HBox); + mid_spacing->set_size_request (20, -1); + + cd_track_details_hbox.set_spacing (4); + cd_track_details_hbox.pack_start (*front_spacing, false, false); + cd_track_details_hbox.pack_start (isrc_label, false, false); + cd_track_details_hbox.pack_start (isrc_entry, false, false); + cd_track_details_hbox.pack_start (performer_label, false, false); + cd_track_details_hbox.pack_start (performer_entry, true, true); + cd_track_details_hbox.pack_start (composer_label, false, false); + cd_track_details_hbox.pack_start (composer_entry, true, true); + cd_track_details_hbox.pack_start (*mid_spacing, false, false); + cd_track_details_hbox.pack_start (scms_label, false, false); + cd_track_details_hbox.pack_start (scms_check_button, false, false); + cd_track_details_hbox.pack_start (preemph_label, false, false); + cd_track_details_hbox.pack_start (preemph_check_button, false, false); + + 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); + + start_hbox.set_spacing (2); + start_hbox.pack_start (start_clock, false, false); + start_hbox.pack_start (start_to_playhead_button, false, false); + + /* this is always in this location, no matter what the location is */ + + VBox *rbox = manage (new VBox); + rbox->pack_start (remove_button, false, false); + + item_table.attach (*rbox, 0, 1, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); + item_table.attach (start_hbox, 2, 3, 0, 1, FILL, Gtk::AttachOptions(0), 4, 0); + + start_to_playhead_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocStart)); + start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart)); + start_clock.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_to_clock), &start_clock), false); + + end_hbox.set_spacing (2); + end_hbox.pack_start (end_clock, false, false); + end_hbox.pack_start (end_to_playhead_button, false, false); + + end_to_playhead_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocEnd)); + end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd)); + end_clock.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_to_clock), &end_clock), false); + + length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength)); + + 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)); + lock_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::lock_toggled)); + glue_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::glue_toggled)); + + remove_button.signal_clicked().connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed)); + + pack_start(item_table, true, true); + + set_location (loc); + set_number (num); + } + + LocationEditRow::~LocationEditRow() + { + if (location) { + connections.drop_connections (); + } + + if (_clock_group) { + _clock_group->remove (start_clock); + _clock_group->remove (end_clock); + _clock_group->remove (length_clock); + } + } + + void + LocationEditRow::set_clock_group (ClockGroup& cg) + { + if (_clock_group) { + _clock_group->remove (start_clock); + _clock_group->remove (end_clock); + _clock_group->remove (length_clock); + } + + _clock_group = &cg; + + _clock_group->add (start_clock); + _clock_group->add (end_clock); + _clock_group->add (length_clock); } void LocationEditRow::set_session (Session *sess) { - session = sess; + SessionHandlePtr::set_session (sess); - if (!session) return; - - start_clock.set_session (session); - end_clock.set_session (session); - length_clock.set_session (session); + if (!_session) { + return; + } + start_clock.set_session (_session); + end_clock.set_session (_session); + length_clock.set_session (_session); } void @@ -184,21 +220,25 @@ 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; - if (!location) return; + if (!location) { + return; + } + + ++i_am_the_modifier; if (!hide_check_button.get_parent()) { - item_table.attach (hide_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (hide_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (lock_check_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (glue_check_button, 8, 9, 0, 1, FILL, Gtk::FILL, 4, 0); } hide_check_button.set_active (location->is_hidden()); + lock_check_button.set_active (location->locked()); + glue_check_button.set_active (location->position_lock_style() == MusicTime); if (location->is_auto_loop() || location-> is_auto_punch()) { // use label instead of entry @@ -206,8 +246,10 @@ LocationEditRow::set_location (Location *loc) name_label.set_text (location->name()); name_label.set_size_request (80, -1); + remove_button.hide (); + if (!name_label.get_parent()) { - item_table.attach (name_label, 0, 1, 0, 1, FILL, FILL, 4, 0); + item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0); } name_label.show(); @@ -220,31 +262,30 @@ LocationEditRow::set_location (Location *loc) 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); + item_table.attach (name_entry, 1, 2, 0, 1, FILL | EXPAND, FILL, 4, 0); } name_entry.show(); if (!cd_check_button.get_parent()) { - item_table.attach (cd_check_button, 4, 5, 0, 1, FILL, FILL, 4, 0); - } - if (!remove_button.get_parent()) { - item_table.attach (remove_button, 6, 7, 0, 1, FILL, FILL, 4, 0); + item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::AttachOptions (0), 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); } hide_check_button.show(); + lock_check_button.show(); + glue_check_button.show(); } start_clock.set (location->start(), true); @@ -252,53 +293,58 @@ LocationEditRow::set_location (Location *loc) if (!location->is_mark()) { if (!end_hbox.get_parent()) { - item_table.attach (end_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0); + item_table.attach (end_hbox, 3, 4, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); } if (!length_clock.get_parent()) { - item_table.attach (length_clock, 3, 4, 0, 1, FILL, FILL, 4, 0); + end_hbox.pack_start (length_clock, false, false); } end_clock.set (location->end(), true); length_clock.set (location->length(), true); - end_go_button.show(); 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 (remove_button, _("Remove this range")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Start time - middle click to locate here")); + ARDOUR_UI::instance()->set_tip (end_clock, _("End time - middle click to locate here")); + ARDOUR_UI::instance()->set_tip (length_clock, _("Length")); + ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set range start from playhead location")); + ARDOUR_UI::instance()->tooltips().set_tip (end_to_playhead_button, _("Set range end from playhead location")); + } 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 (remove_button, _("Remove this marker")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Position - middle click to locate here")); + + ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set marker time from playhead location")); - end_go_button.hide(); end_clock.hide(); length_clock.hide(); } - start_clock.set_sensitive (!location->locked()); - end_clock.set_sensitive (!location->locked()); - length_clock.set_sensitive (!location->locked()); + set_clock_sensitivity (); - 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)); + --i_am_the_modifier; + + 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()); + location->LockChanged.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::lock_changed, this, _1), gui_context()); + location->PositionLockStyleChanged.connect (connections, invalidator (*this), ui_bind (&LocationEditRow::position_lock_style_changed, this, _1), gui_context()); } void LocationEditRow::name_entry_changed () { ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed) - if (i_am_the_modifier || !location) return; + + if (i_am_the_modifier || !location) { + return; + } location->set_name (name_entry.get_text()); } @@ -348,28 +394,41 @@ LocationEditRow::composer_entry_changed () } } - void -LocationEditRow::go_button_pressed (LocationPart part) +LocationEditRow::to_playhead_button_pressed (LocationPart part) { - if (!location) return; + if (!location) { + return; + } switch (part) { case LocStart: - ARDOUR_UI::instance()->do_transport_locate (location->start()); + location->set_start (_session->transport_frame ()); break; case LocEnd: - ARDOUR_UI::instance()->do_transport_locate (location->end()); + location->set_end (_session->transport_frame ()); break; default: break; } } +bool +LocationEditRow::locate_to_clock (GdkEventButton* ev, AudioClock* clock) +{ + if (Keyboard::is_button2_event (ev)) { + _session->request_locate (clock->current_time()); + return true; + } + return false; +} + void LocationEditRow::clock_changed (LocationPart part) { - if (i_am_the_modifier || !location) return; + if (i_am_the_modifier || !location) { + return; + } switch (part) { case LocStart: @@ -383,15 +442,6 @@ LocationEditRow::clock_changed (LocationPart part) default: break; } - -} - -void -LocationEditRow::change_aborted (LocationPart /*part*/) -{ - if (i_am_the_modifier || !location) return; - - set_location(location); } void @@ -406,7 +456,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; @@ -450,17 +500,49 @@ LocationEditRow::cd_toggled () void LocationEditRow::hide_toggled () { - if (i_am_the_modifier || !location) return; + if (i_am_the_modifier || !location) { + return; + } location->set_hidden (hide_check_button.get_active(), this); } +void +LocationEditRow::lock_toggled () +{ + if (i_am_the_modifier || !location) { + return; + } + + if (location->locked()) { + location->unlock (); + } else { + location->lock (); + } +} + +void +LocationEditRow::glue_toggled () +{ + if (i_am_the_modifier || !location) { + return; + } + + if (location->position_lock_style() == AudioTime) { + location->set_position_lock_style (MusicTime); + } else { + location->set_position_lock_style (AudioTime); + } +} + void LocationEditRow::remove_button_pressed () { - if (!location) return; + if (!location) { + return; + } - remove_requested(location); /* EMIT_SIGNAL */ + remove_requested (location); /* EMIT_SIGNAL */ } @@ -491,7 +573,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *loc) +LocationEditRow::end_changed (ARDOUR::Location *) { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) @@ -507,10 +589,8 @@ LocationEditRow::end_changed (ARDOUR::Location *loc) } void -LocationEditRow::start_changed (ARDOUR::Location *loc) +LocationEditRow::start_changed (ARDOUR::Location*) { - ENSURE_GUI_THREAD (*this, &LocationEditRow::start_changed, loc) - if (!location) return; // update end and length @@ -518,7 +598,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); @@ -528,10 +608,8 @@ LocationEditRow::start_changed (ARDOUR::Location *loc) } void -LocationEditRow::name_changed (ARDOUR::Location *loc) +LocationEditRow::name_changed (ARDOUR::Location *) { - ENSURE_GUI_THREAD (*this, &LocationEditRow::name_changed, loc) - if (!location) return; // update end and length @@ -545,9 +623,8 @@ LocationEditRow::name_changed (ARDOUR::Location *loc) } void -LocationEditRow::location_changed (ARDOUR::Location *loc) +LocationEditRow::location_changed (ARDOUR::Location*) { - ENSURE_GUI_THREAD (*this, &LocationEditRow::location_changed, loc) if (!location) return; @@ -557,25 +634,54 @@ LocationEditRow::location_changed (ARDOUR::Location *loc) end_clock.set (location->end()); length_clock.set (location->length()); - start_clock.set_sensitive (!location->locked()); - end_clock.set_sensitive (!location->locked()); - length_clock.set_sensitive (!location->locked()); + set_clock_sensitivity (); i_am_the_modifier--; } void -LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src) +LocationEditRow::flags_changed (ARDOUR::Location*, void *) { - ENSURE_GUI_THREAD (*this, &LocationEditRow::flags_changed, loc, src) - - if (!location) return; + if (!location) { + return; + } i_am_the_modifier++; cd_check_button.set_active (location->is_cd_marker()); hide_check_button.set_active (location->is_hidden()); + glue_check_button.set_active (location->position_lock_style() == MusicTime); + + i_am_the_modifier--; +} + +void +LocationEditRow::lock_changed (ARDOUR::Location*) +{ + if (!location) { + return; + } + + i_am_the_modifier++; + + lock_check_button.set_active (location->locked()); + + set_clock_sensitivity (); + + i_am_the_modifier--; +} + +void +LocationEditRow::position_lock_style_changed (ARDOUR::Location*) +{ + if (!location) { + return; + } + + i_am_the_modifier++; + + glue_check_button.set_active (location->position_lock_style() == MusicTime); i_am_the_modifier--; } @@ -585,27 +691,61 @@ LocationEditRow::focus_name() { name_entry.grab_focus(); } +void +LocationEditRow::set_clock_sensitivity () +{ + start_clock.set_sensitive (!location->locked()); + end_clock.set_sensitive (!location->locked()); + length_clock.set_sensitive (!location->locked()); +} + +/*------------------------------------------------------------------------*/ LocationUI::LocationUI () - : session (0) - , add_location_button (_("New Marker")) + : add_location_button (_("New Marker")) , add_range_button (_("New Range")) { i_am_the_modifier = 0; - location_vpacker.set_spacing (5); - - add_location_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_BUTTON))); - add_range_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_BUTTON))); + _clock_group = new ClockGroup; + + VBox* vbox = manage (new VBox); + + Table* table = manage (new Table (2, 2)); + table->set_spacings (2); + table->set_col_spacing (0, 32); + int table_row = 0; + + Label* l = manage (new Label (_("Loop/Punch Ranges"))); + l->set_alignment (0, 0.5); + l->set_use_markup (true); + table->attach (*l, 0, 2, table_row, table_row + 1); + ++table_row; + + loop_edit_row.set_clock_group (*_clock_group); + punch_edit_row.set_clock_group (*_clock_group); loop_punch_box.pack_start (loop_edit_row, false, false); loop_punch_box.pack_start (punch_edit_row, false, false); - - loop_punch_scroller.add (loop_punch_box); - loop_punch_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); - loop_punch_scroller.set_shadow_type (Gtk::SHADOW_NONE); - - location_vpacker.pack_start (loop_punch_scroller, false, false); + + table->attach (loop_punch_box, 1, 2, table_row, table_row + 1); + ++table_row; + + vbox->pack_start (*table, false, false); + + table = manage (new Table (3, 2)); + table->set_spacings (2); + table->set_col_spacing (0, 32); + table_row = 0; + + table->attach (*manage (new Label ("")), 0, 2, table_row, table_row + 1, Gtk::SHRINK, Gtk::SHRINK); + ++table_row; + + l = manage (new Label (_("Markers (Including CD Index)"))); + l->set_alignment (0, 0.5); + l->set_use_markup (true); + table->attach (*l, 0, 2, table_row, table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); + ++table_row; location_rows.set_name("LocationLocRows"); location_rows_scroller.add (location_rows); @@ -622,17 +762,25 @@ LocationUI::LocationUI () loc_frame_box.pack_start (location_rows_scroller, true, true); add_location_button.set_name ("LocationAddLocationButton"); - - HBox* add_button_box = manage (new HBox); - // loc_frame_box.pack_start (add_location_button, false, false); - add_button_box->pack_start (add_location_button, true, true); + table->attach (loc_frame_box, 0, 2, table_row, table_row + 1); + ++table_row; + + loc_range_panes.pack1 (*table, true, false); + + table = manage (new Table (3, 2)); + table->set_spacings (2); + table->set_col_spacing (0, 32); + table_row = 0; - loc_frame.set_name ("LocationLocEditorFrame"); - loc_frame.set_label (_("Markers (including CD index)")); - loc_frame.add (loc_frame_box); - loc_range_panes.pack1(loc_frame, true, false); + table->attach (*manage (new Label ("")), 0, 2, table_row, table_row + 1, Gtk::SHRINK, Gtk::SHRINK); + ++table_row; + l = manage (new Label (_("Ranges (Including CD Track Ranges)"))); + l->set_alignment (0, 0.5); + l->set_use_markup (true); + table->attach (*l, 0, 2, table_row, table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); + ++table_row; range_rows.set_name("LocationRangeRows"); range_rows_scroller.add (range_rows); @@ -646,30 +794,35 @@ LocationUI::LocationUI () range_frame_box.pack_start (range_rows_scroller, true, true); add_range_button.set_name ("LocationAddRangeButton"); - //range_frame_box.pack_start (add_range_button, false, false); + table->attach (range_frame_box, 0, 2, table_row, table_row + 1); + ++table_row; + + loc_range_panes.pack2 (*table, true, false); + + HBox* add_button_box = manage (new HBox); + add_button_box->pack_start (add_location_button, true, true); add_button_box->pack_start (add_range_button, true, true); - range_frame.set_name ("LocationRangeEditorFrame"); - range_frame.set_label (_("Ranges (including CD track ranges)")); - range_frame.add (range_frame_box); - loc_range_panes.pack2(range_frame, true, false); - location_vpacker.pack_start (loc_range_panes, true, true); - location_vpacker.pack_start (*add_button_box, false, false); + vbox->pack_start (loc_range_panes, true, true); + vbox->pack_start (*add_button_box, false, false); - pack_start (location_vpacker, true, true); + pack_start (*vbox); 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 (); + + signal_map().connect (sigc::mem_fun (*this, &LocationUI::refresh_location_list)); } LocationUI::~LocationUI() { + delete _clock_group; } -gint +gint LocationUI::do_location_remove (ARDOUR::Location *loc) { /* this is handled internally by Locations, but there's @@ -677,21 +830,21 @@ 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; } -void +void LocationUI::location_remove_requested (ARDOUR::Location *loc) { // must do this to prevent problems when destroying @@ -701,26 +854,62 @@ LocationUI::location_remove_requested (ARDOUR::Location *loc) } -void +void LocationUI::location_redraw_ranges () { range_rows.hide(); range_rows.show(); } +struct LocationSortByStart { + bool operator() (Location *a, Location *b) { + return a->start() < b->start(); + } +}; + void LocationUI::location_added (Location* 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 { - refresh_location_list (); + } else if (location->is_range_marker() || location->is_mark()) { + Locations::LocationList loc = _session->locations()->list (); + loc.sort (LocationSortByStart ()); + + LocationEditRow* erow = manage (new LocationEditRow (_session, location)); + + erow->set_clock_group (*_clock_group); + erow->remove_requested.connect (sigc::mem_fun (*this, &LocationUI::location_remove_requested)); + + Box_Helpers::BoxList & children = location->is_range_marker() ? range_rows.children () : location_rows.children (); + + /* Step through the location list and the GUI list to find the place to insert */ + Locations::LocationList::iterator i = loc.begin (); + Box_Helpers::BoxList::iterator j = children.begin (); + while (i != loc.end()) { + + if (location->flags() != (*i)->flags()) { + /* Skip locations in the session list that aren't of the right type */ + ++i; + continue; + } + + if (*i == location) { + children.insert (j, Box_Helpers::Element (*erow, PACK_SHRINK, 1, PACK_START)); + break; + } + + ++i; + + if (j != children.end()) { + ++j; + } + } + + range_rows.show_all (); + location_rows.show_all (); } } @@ -731,26 +920,24 @@ LocationUI::location_removed (Location* 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; + } + } } } -struct LocationSortByStart { - bool operator() (Location *a, Location *b) { - return a->start() < b->start(); - } -}; - 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 +946,38 @@ 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)); + LocationEditRow* erow = manage (new LocationEditRow (_session, location, mark_n)); + + erow->set_clock_group (*_clock_group); erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested)); - erow->redraw_ranges.connect (sigc::mem_fun(*this, &LocationUI::location_redraw_ranges)); + 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)); + } else { + LocationEditRow* erow = manage (new LocationEditRow(_session, location)); + + erow->set_clock_group (*_clock_group); 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 +991,19 @@ LocationUI::add_new_location() { string markername; - 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 (_session) { + framepos_t where = _session->audible_frame(); + _session->locations()->next_available_name(markername,"mark"); + Location *location = new Location (*_session, 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 +1013,19 @@ LocationUI::add_new_range() { string rangename; - 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 (); + if (_session) { + framepos_t where = _session->audible_frame(); + _session->locations()->next_available_name(rangename,"unnamed"); + Location *location = new Location (*_session, 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 (); } } - -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 () { @@ -855,7 +1033,9 @@ LocationUI::refresh_location_list () using namespace Box_Helpers; // this is just too expensive to do when window is not shown - if (!is_visible()) return; + if (!is_mapped()) { + return; + } BoxList & loc_children = location_rows.children(); BoxList & range_children = range_rows.children(); @@ -863,31 +1043,45 @@ 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); } - } void LocationUI::set_session(ARDOUR::Session* s) { - 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)); + SessionHandlePtr::set_session (s); + + 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()); + _clock_group->set_clock_mode (clock_mode_from_session_instant_xml ()); } + + 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 (*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,29 +1095,55 @@ LocationUI::session_gone() punch_edit_row.set_session (0); punch_edit_row.set_location (0); + + SessionHandlePtr::session_going_away (); +} + +XMLNode & +LocationUI::get_state () const +{ + XMLNode* node = new XMLNode (X_("LocationUI")); + node->add_property (X_("clock-mode"), enum_2_string (_clock_group->clock_mode ())); + return *node; +} + +AudioClock::Mode +LocationUI::clock_mode_from_session_instant_xml () const +{ + XMLNode* node = _session->instant_xml (X_("LocationUI")); + if (!node) { + return AudioClock::Frames; + } + + XMLProperty* p = node->property (X_("clock-mode")); + if (!p) { + return AudioClock::Frames; + } + + return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode); } + /*------------------------*/ LocationUIWindow::LocationUIWindow () - : ArdourDialog ("locations dialog") + : ArdourWindow (_("Locations")) { - set_title (_("Locations")); - set_wmclass(X_("ardour_locations"), "Ardour"); + set_wmclass(X_("ardour_locations"), PROGRAM_NAME); set_name ("LocationWindow"); - get_vbox()->pack_start (_ui); + add (_ui); } LocationUIWindow::~LocationUIWindow() { } -void -LocationUIWindow::on_show() +void +LocationUIWindow::on_map () { + ArdourWindow::on_map (); _ui.refresh_location_list(); - ArdourDialog::on_show(); } bool @@ -936,15 +1156,13 @@ LocationUIWindow::on_delete_event (GdkEventAny*) void LocationUIWindow::set_session (Session *s) { - ArdourDialog::set_session (s); + ArdourWindow::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 () { + ArdourWindow::session_going_away (); hide_all(); - ArdourDialog::session_gone (); }