X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=7dfc2ecbce5dfe6fb16cd60a6a1aa4c5f06f6f56;hb=205fbb99ad65b899a5047165422f442d9930103a;hp=aadbbfc5b7c6445da65e7077d58196c86de67091;hpb=b85b4d9e54caef0585d308ef3bffee21d0e5ae56;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index aadbbfc5b7..7dfc2ecbce 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -22,57 +22,59 @@ #include -#include "ardour/utils.h" -#include "ardour/configuration.h" #include "ardour/session.h" #include "pbd/memento_command.h" #include "ardour_ui.h" -#include "prompter.h" -#include "location_ui.h" +#include "clock_group.h" +#include "main_clock.h" +#include "gui_thread.h" #include "keyboard.h" +#include "location_ui.h" +#include "prompter.h" #include "utils.h" -#include "gui_thread.h" +#include "public_editor.h" +#include "tooltips.h" +#include "ui_config.h" #include "i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) - : 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), - length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, false, true), - cd_check_button (_("CD")), - hide_check_button (_("Hide")), - lock_check_button (_("Lock")), - glue_check_button (_("Glue")), - 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")) + , locate_to_start_button (_("Goto")) + , end_clock (X_("locationend"), true, "", true, false) + , end_to_playhead_button (_("Use PH")) + , locate_to_end_button (_("Goto")) + , 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))); + remove_button.set_icon (ArdourIcon::CloseCross); + remove_button.set_events (remove_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); 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"); 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"); @@ -82,12 +84,11 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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_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); @@ -101,14 +102,24 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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 (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); + 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)); @@ -118,38 +129,45 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) set_session (sess); - start_hbox.pack_start (start_go_button, false, false); + start_hbox.set_spacing (2); + start_hbox.pack_start (locate_to_start_button, false, false); 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 */ - item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0); + item_table.attach (remove_button, 8, 9, 0, 1, SHRINK, SHRINK, 4, 1); + item_table.attach (start_hbox, 0, 1, 0, 1, FILL, Gtk::AttachOptions(0), 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)); + start_to_playhead_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocStart)); + locate_to_start_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_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.pack_start (end_go_button, false, false); + end_hbox.set_spacing (2); + end_hbox.pack_start (locate_to_end_button, false, false); end_hbox.pack_start (end_clock, false, false); + end_hbox.pack_start (end_to_playhead_button, false, false); - end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); + end_to_playhead_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocEnd)); + locate_to_end_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_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)); + 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)); - 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)); 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)); + 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); + cd_toggled(); // show/hide cd-track details } LocationEditRow::~LocationEditRow() @@ -157,6 +175,28 @@ 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 @@ -164,14 +204,13 @@ LocationEditRow::set_session (Session *sess) { SessionHandlePtr::set_session (sess); - if (!_session) { + if (!_session) { return; } start_clock.set_session (_session); end_clock.set_session (_session); length_clock.set_session (_session); - } void @@ -214,8 +253,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, 2, 3, 0, 1, EXPAND|FILL, FILL, 4, 0); } name_label.show(); @@ -228,15 +269,12 @@ 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, 2, 3, 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, 8, 9, 0, 1, FILL, FILL, 4, 0); + item_table.attach (cd_check_button, 4, 5, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); } if (location->is_session_range()) { @@ -262,55 +300,61 @@ 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, 1, 2, 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, 4); } 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()->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")); + if (location->is_cd_marker()) { + show_cd_track_details (); + } + + set_tooltip (&remove_button, _("Remove this range")); + set_tooltip (start_clock, _("Start time - middle click to locate here")); + set_tooltip (end_clock, _("End time - middle click to locate here")); + set_tooltip (length_clock, _("Length")); + + set_tooltip (&start_to_playhead_button, _("Set range start from playhead location")); + set_tooltip (&end_to_playhead_button, _("Set range end from playhead location")); } else { - 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")); + set_tooltip (&remove_button, _("Remove this marker")); + set_tooltip (start_clock, _("Position - middle click to locate here")); + + set_tooltip (&start_to_playhead_button, _("Set marker time from playhead location")); - end_go_button.hide(); end_clock.hide(); length_clock.hide(); } - set_clock_sensitivity (); + set_clock_editable_status (); --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()); + /* 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 LocationEditRow::name_entry_changed () { - ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed) - + ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed); + if (i_am_the_modifier || !location) { return; } @@ -322,65 +366,92 @@ LocationEditRow::name_entry_changed () void LocationEditRow::isrc_entry_changed () { - ENSURE_GUI_THREAD (*this, &LocationEditRow::isrc_entry_changed) + ENSURE_GUI_THREAD (*this, &LocationEditRow::isrc_entry_changed); if (i_am_the_modifier || !location) return; if (isrc_entry.get_text() != "" ) { - location->cd_info["isrc"] = isrc_entry.get_text(); + location->cd_info["isrc"] = isrc_entry.get_text(); } else { - location->cd_info.erase("isrc"); + location->cd_info.erase("isrc"); } } void LocationEditRow::performer_entry_changed () { - ENSURE_GUI_THREAD (*this, &LocationEditRow::performer_entry_changed) + ENSURE_GUI_THREAD (*this, &LocationEditRow::performer_entry_changed); if (i_am_the_modifier || !location) return; if (performer_entry.get_text() != "") { - location->cd_info["performer"] = performer_entry.get_text(); + location->cd_info["performer"] = performer_entry.get_text(); } else { - location->cd_info.erase("performer"); + location->cd_info.erase("performer"); } } void LocationEditRow::composer_entry_changed () { - ENSURE_GUI_THREAD (*this, &LocationEditRow::composer_entry_changed) + ENSURE_GUI_THREAD (*this, &LocationEditRow::composer_entry_changed); if (i_am_the_modifier || !location) return; if (composer_entry.get_text() != "") { - location->cd_info["composer"] = composer_entry.get_text(); + location->cd_info["composer"] = composer_entry.get_text(); } else { - location->cd_info.erase("composer"); + location->cd_info.erase("composer"); } } - void -LocationEditRow::go_button_pressed (LocationPart part) +LocationEditRow::to_playhead_button_pressed (LocationPart part) { if (!location) { return; } switch (part) { - case LocStart: - ARDOUR_UI::instance()->do_transport_locate (location->start(), _session->transport_rolling ()); - break; - case LocEnd: - ARDOUR_UI::instance()->do_transport_locate (location->end(), _session->transport_rolling ()); - break; - default: - break; + case LocStart: + location->set_start (_session->transport_frame ()); + break; + case LocEnd: + location->set_end (_session->transport_frame ()); + if (location->is_session_range()) { + _session->set_end_is_free (false); + } + break; + default: + break; + } +} + +void +LocationEditRow::locate_button_pressed (LocationPart part) +{ + switch (part) { + case LocStart: + _session->request_locate (start_clock.current_time()); + break; + case LocEnd: + _session->request_locate (end_clock.current_time()); + 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 @@ -391,25 +462,50 @@ LocationEditRow::clock_changed (LocationPart part) } switch (part) { - case LocStart: - location->set_start (start_clock.current_time()); - break; - case LocEnd: - location->set_end (end_clock.current_time()); - break; - case LocLength: - location->set_end (location->start() + length_clock.current_duration()); - default: - break; + case LocStart: + location->set_start (start_clock.current_time()); + break; + case LocEnd: + location->set_end (end_clock.current_time()); + if (location->is_session_range()) { + _session->set_end_is_free (false); + } + break; + case LocLength: + location->set_end (location->start() + length_clock.current_duration()); + if (location->is_session_range()) { + _session->set_end_is_free (false); + } + default: + break; } } void -LocationEditRow::change_aborted (LocationPart /*part*/) +LocationEditRow::show_cd_track_details () { - if (i_am_the_modifier || !location) return; + if (location->cd_info.find("isrc") != location->cd_info.end()) { + isrc_entry.set_text(location->cd_info["isrc"]); + } + if (location->cd_info.find("performer") != location->cd_info.end()) { + performer_entry.set_text(location->cd_info["performer"]); + } + if (location->cd_info.find("composer") != location->cd_info.end()) { + composer_entry.set_text(location->cd_info["composer"]); + } + if (location->cd_info.find("scms") != location->cd_info.end()) { + scms_check_button.set_active(true); + } + if (location->cd_info.find("preemph") != location->cd_info.end()) { + preemph_check_button.set_active(true); + } + - set_location(location); + if (!cd_track_details_hbox.get_parent()) { + item_table.attach (cd_track_details_hbox, 0, 7, 1, 2, FILL | EXPAND, FILL, 4, 0); + } + // item_table.resize(2, 7); + cd_track_details_hbox.show_all(); } void @@ -433,29 +529,9 @@ LocationEditRow::cd_toggled () location->set_cd (cd_check_button.get_active(), this); - if (location->is_cd_marker() && !(location->is_mark())) { + if (location->is_cd_marker()) { - if (location->cd_info.find("isrc") != location->cd_info.end()) { - isrc_entry.set_text(location->cd_info["isrc"]); - } - if (location->cd_info.find("performer") != location->cd_info.end()) { - performer_entry.set_text(location->cd_info["performer"]); - } - if (location->cd_info.find("composer") != location->cd_info.end()) { - composer_entry.set_text(location->cd_info["composer"]); - } - if (location->cd_info.find("scms") != location->cd_info.end()) { - scms_check_button.set_active(true); - } - if (location->cd_info.find("preemph") != location->cd_info.end()) { - preemph_check_button.set_active(true); - } - - if (!cd_track_details_hbox.get_parent()) { - item_table.attach (cd_track_details_hbox, 0, 7, 1, 2, FILL | EXPAND, FILL, 4, 0); - } - // item_table.resize(2, 7); - cd_track_details_hbox.show_all(); + show_cd_track_details (); } else if (cd_track_details_hbox.get_parent()){ @@ -541,7 +617,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *loc) +LocationEditRow::end_changed () { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) @@ -557,7 +633,7 @@ LocationEditRow::end_changed (ARDOUR::Location *loc) } void -LocationEditRow::start_changed (ARDOUR::Location*) +LocationEditRow::start_changed () { if (!location) return; @@ -576,7 +652,7 @@ LocationEditRow::start_changed (ARDOUR::Location*) } void -LocationEditRow::name_changed (ARDOUR::Location *) +LocationEditRow::name_changed () { if (!location) return; @@ -591,7 +667,7 @@ LocationEditRow::name_changed (ARDOUR::Location *) } void -LocationEditRow::location_changed (ARDOUR::Location*) +LocationEditRow::location_changed () { if (!location) return; @@ -602,14 +678,14 @@ LocationEditRow::location_changed (ARDOUR::Location*) end_clock.set (location->end()); length_clock.set (location->length()); - set_clock_sensitivity (); + set_clock_editable_status (); i_am_the_modifier--; } void -LocationEditRow::flags_changed (ARDOUR::Location*, void *) +LocationEditRow::flags_changed () { if (!location) { return; @@ -625,7 +701,7 @@ LocationEditRow::flags_changed (ARDOUR::Location*, void *) } void -LocationEditRow::lock_changed (ARDOUR::Location*) +LocationEditRow::lock_changed () { if (!location) { return; @@ -635,13 +711,13 @@ LocationEditRow::lock_changed (ARDOUR::Location*) lock_check_button.set_active (location->locked()); - set_clock_sensitivity (); + set_clock_editable_status (); i_am_the_modifier--; } void -LocationEditRow::position_lock_style_changed (ARDOUR::Location*) +LocationEditRow::position_lock_style_changed () { if (!location) { return; @@ -655,10 +731,20 @@ LocationEditRow::position_lock_style_changed (ARDOUR::Location*) } void -LocationEditRow::focus_name() { - name_entry.grab_focus(); +LocationEditRow::focus_name() +{ + name_entry.grab_focus (); } +void +LocationEditRow::set_clock_editable_status () +{ + start_clock.set_editable (!location->locked()); + end_clock.set_editable (!location->locked()); + length_clock.set_editable (!location->locked()); +} + +/*------------------------------------------------------------------------*/ LocationUI::LocationUI () : add_location_button (_("New Marker")) @@ -666,10 +752,12 @@ LocationUI::LocationUI () { i_am_the_modifier = 0; + _clock_group = new ClockGroup; + VBox* vbox = manage (new VBox); Table* table = manage (new Table (2, 2)); - table->set_spacings (4); + table->set_spacings (2); table->set_col_spacing (0, 32); int table_row = 0; @@ -679,22 +767,26 @@ LocationUI::LocationUI () 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.set_border_width (6); // 5 + 1 px framebox-border loop_punch_box.pack_start (loop_edit_row, false, false); loop_punch_box.pack_start (punch_edit_row, 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 (4); + + 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); @@ -717,19 +809,19 @@ LocationUI::LocationUI () add_location_button.set_name ("LocationAddLocationButton"); - table->attach (loc_frame_box, 1, 2, table_row, table_row + 1); + table->attach (loc_frame_box, 0, 2, table_row, table_row + 1); ++table_row; - loc_range_panes.pack1 (*table, true, false); + loc_range_panes.add (*table); - table = manage (new Table (3, 2)); - table->set_spacings (4); + 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 (_("Ranges (Including CD Track Ranges)"))); l->set_alignment (0, 0.5); l->set_use_markup (true); @@ -749,10 +841,10 @@ LocationUI::LocationUI () add_range_button.set_name ("LocationAddRangeButton"); - table->attach (range_frame_box, 1, 2, table_row, table_row + 1); + table->attach (range_frame_box, 0, 2, table_row, table_row + 1); ++table_row; - loc_range_panes.pack2 (*table, true, false); + loc_range_panes.add (*table); HBox* add_button_box = manage (new HBox); add_button_box->pack_start (add_location_button, true, true); @@ -765,15 +857,20 @@ LocationUI::LocationUI () 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() { + loop_edit_row.unset_clock_group (); + punch_edit_row.unset_clock_group (); + delete _clock_group; } -gint +gint LocationUI::do_location_remove (ARDOUR::Location *loc) { /* this is handled internally by Locations, but there's @@ -785,17 +882,17 @@ LocationUI::do_location_remove (ARDOUR::Location *loc) return FALSE; } - _session->begin_reversible_command (_("remove marker")); + PublicEditor::instance().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 (); + PublicEditor::instance().commit_reversible_command (); return FALSE; } -void +void LocationUI::location_remove_requested (ARDOUR::Location *loc) { // must do this to prevent problems when destroying @@ -805,7 +902,7 @@ LocationUI::location_remove_requested (ARDOUR::Location *loc) } -void +void LocationUI::location_redraw_ranges () { range_rows.hide(); @@ -813,9 +910,9 @@ LocationUI::location_redraw_ranges () } struct LocationSortByStart { - bool operator() (Location *a, Location *b) { - return a->start() < b->start(); - } + bool operator() (Location *a, Location *b) { + return a->start() < b->start(); + } }; void @@ -830,7 +927,10 @@ LocationUI::location_added (Location* location) 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 */ @@ -850,7 +950,7 @@ LocationUI::location_added (Location* location) } ++i; - + if (j != children.end()) { ++j; } @@ -858,6 +958,11 @@ LocationUI::location_added (Location* location) range_rows.show_all (); location_rows.show_all (); + + if (location == newest_location) { + newest_location = 0; + erow->focus_name(); + } } } @@ -883,7 +988,7 @@ LocationUI::location_removed (Location* location) } void -LocationUI::map_locations (Locations::LocationList& locations) +LocationUI::map_locations (const Locations::LocationList& locations) { Locations::LocationList::iterator i; gint n; @@ -892,22 +997,20 @@ LocationUI::map_locations (Locations::LocationList& locations) LocationSortByStart cmp; temp.sort (cmp); - locations = temp; - for (n = 0, i = locations.begin(); i != locations.end(); ++n, ++i) { + for (n = 0, i = temp.begin(); i != temp.end(); ++n, ++i) { Location* location = *i; if (location->is_mark()) { 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)); + 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); punch_edit_row.set_location (location); @@ -918,7 +1021,10 @@ LocationUI::map_locations (Locations::LocationList& locations) loop_edit_row.show_all(); } 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)); } @@ -934,18 +1040,18 @@ LocationUI::add_new_location() string markername; if (_session) { - nframes_t where = _session->audible_frame(); + 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()) { + if (UIConfiguration::instance().get_name_new_markers()) { newest_location = location; } - _session->begin_reversible_command (_("add marker")); + PublicEditor::instance().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 (); + PublicEditor::instance().commit_reversible_command (); } } @@ -956,15 +1062,15 @@ LocationUI::add_new_range() string rangename; if (_session) { - nframes_t where = _session->audible_frame(); + 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")); + PublicEditor::instance().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 (); + PublicEditor::instance().commit_reversible_command (); } } @@ -975,7 +1081,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(); @@ -986,7 +1094,6 @@ LocationUI::refresh_location_list () if (_session) { _session->locations()->apply (*this, &LocationUI::map_locations); } - } void @@ -995,10 +1102,11 @@ LocationUI::set_session(ARDOUR::Session* s) 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()); + _session->locations()->added.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::location_added, this, _1), gui_context()); + _session->locations()->removed.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::location_removed, this, _1), gui_context()); + _session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::refresh_location_list, this), gui_context()); + + _clock_group->set_clock_mode (clock_mode_from_session_instant_xml ()); } loop_edit_row.set_session (s); @@ -1007,17 +1115,6 @@ LocationUI::set_session(ARDOUR::Session* s) refresh_location_list (); } -void -LocationUI::locations_changed (Locations::Change c) -{ - /* 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() { @@ -1039,53 +1136,70 @@ LocationUI::session_going_away() SessionHandlePtr::session_going_away (); } -void -LocationEditRow::set_clock_sensitivity () +XMLNode & +LocationUI::get_state () const { - start_clock.set_sensitive (!location->locked()); - end_clock.set_sensitive (!location->locked()); - length_clock.set_sensitive (!location->locked()); + 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 const * p = node->property (X_("clock-mode")); + if (!p) { + return ARDOUR_UI::instance()->secondary_clock->mode(); + } + + return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode); +} + + /*------------------------*/ LocationUIWindow::LocationUIWindow () - : ArdourDialog (_("Locations")) + : ArdourWindow (S_("Ranges|Locations")) { 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 LocationUIWindow::on_delete_event (GdkEventAny*) { - hide (); - return true; + return false; } void LocationUIWindow::set_session (Session *s) { - ArdourDialog::set_session (s); + ArdourWindow::set_session (s); _ui.set_session (s); + _ui.show_all (); } void LocationUIWindow::session_going_away () { - ArdourDialog::session_going_away (); + ArdourWindow::session_going_away (); hide_all(); }