X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=658b7326d9a25ff6b0fc1e5a8b17ea5776706dc0;hb=ec6a85f921b2b6c950c6c94f0392c059cffba5dd;hp=d1b82f8c66459c257d755b22ef7fa4d1277f5180;hpb=28101d40d091b729f7c192f6469a10c5e7029cba;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index d1b82f8c66..658b7326d9 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -24,173 +24,179 @@ #include "ardour/session.h" #include "pbd/memento_command.h" +#include "widgets/tooltips.h" #include "ardour_ui.h" #include "clock_group.h" +#include "enums_convert.h" +#include "main_clock.h" #include "gui_thread.h" #include "keyboard.h" #include "location_ui.h" -#include "prompter.h" #include "utils.h" +#include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ArdourWidgets; 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, "", true, false) + , 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) + , locate_to_start_button (_("Goto")) + , 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) + , 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; - - remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_MENU))); - - start_to_playhead_button.set_name ("LocationEditCdButton"); - end_to_playhead_button.set_name ("LocationEditCdButton"); - - 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); + i_am_the_modifier = 0; + + 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"); + cd_check_button.set_name ("LocationEditCdButton"); + hide_check_button.set_name ("LocationEditHideButton"); + lock_check_button.set_name ("LocationEditLockButton"); + glue_check_button.set_name ("LocationEditGlueButton"); + 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 (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 (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_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.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_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.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); + cd_toggled(); // show/hide cd-track details +} + +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 @@ -233,9 +239,9 @@ LocationEditRow::set_location (Location *loc) ++i_am_the_modifier; if (!hide_check_button.get_parent()) { - 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); + item_table.attach (hide_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (lock_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (glue_check_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0); } hide_check_button.set_active (location->is_hidden()); lock_check_button.set_active (location->locked()); @@ -250,7 +256,7 @@ LocationEditRow::set_location (Location *loc) remove_button.hide (); if (!name_label.get_parent()) { - item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0); + item_table.attach (name_label, 2, 3, 0, 1, EXPAND|FILL, FILL, 4, 0); } name_label.show(); @@ -263,12 +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, 1, 2, 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, 5, 6, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); + item_table.attach (cd_check_button, 4, 5, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); } if (location->is_session_range()) { @@ -294,10 +300,10 @@ LocationEditRow::set_location (Location *loc) if (!location->is_mark()) { if (!end_hbox.get_parent()) { - item_table.attach (end_hbox, 3, 4, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); + item_table.attach (end_hbox, 1, 2, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0); } if (!length_clock.get_parent()) { - end_hbox.pack_start (length_clock, false, false); + end_hbox.pack_start (length_clock, false, false, 4); } end_clock.set (location->end(), true); @@ -306,20 +312,24 @@ LocationEditRow::set_location (Location *loc) end_clock.show(); length_clock.show(); - 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")); + 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")); - 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()->set_tip (remove_button, _("Remove this marker")); - ARDOUR_UI::instance()->set_tip (start_clock, _("Position - middle click to locate here")); + set_tooltip (&remove_button, _("Remove this marker")); + set_tooltip (start_clock, _("Position - middle click to locate here")); - ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set marker time from playhead location")); + set_tooltip (&start_to_playhead_button, _("Set marker time from playhead location")); end_clock.hide(); length_clock.hide(); @@ -329,19 +339,21 @@ LocationEditRow::set_location (Location *loc) --i_am_the_modifier; - location->start_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::start_changed, this, _1), gui_context()); - location->end_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::end_changed, this, _1), gui_context()); - location->name_changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::name_changed, this, _1), gui_context()); - location->changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this, _1), gui_context()); - location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this, _1, _2), gui_context()); - location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this, _1), gui_context()); - location->PositionLockStyleChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::position_lock_style_changed, this, _1), gui_context()); + /* connect to per-location signals, since this row only cares about this location */ + + location->NameChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::name_changed, this), gui_context()); + location->StartChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::start_changed, this), gui_context()); + location->EndChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::end_changed, this), gui_context()); + location->Changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this), gui_context()); + location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this), gui_context()); + location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this), gui_context()); + location->PositionLockStyleChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::position_lock_style_changed, this), gui_context()); } void 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; @@ -354,44 +366,44 @@ 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"); } } @@ -402,15 +414,35 @@ LocationEditRow::to_playhead_button_pressed (LocationPart part) return; } + const int32_t divisions = PublicEditor::instance().get_grid_music_divisions (0); + + switch (part) { + case LocStart: + location->set_start (_session->transport_frame (), false, true, divisions); + break; + case LocEnd: + location->set_end (_session->transport_frame (), false, true,divisions); + 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: - location->set_start (_session->transport_frame ()); - break; - case LocEnd: - location->set_end (_session->transport_frame ()); - break; - default: - break; + case LocStart: + _session->request_locate (start_clock.current_time()); + break; + case LocEnd: + _session->request_locate (end_clock.current_time()); + break; + default: + break; } } @@ -431,20 +463,55 @@ LocationEditRow::clock_changed (LocationPart part) return; } + const int32_t divisions = PublicEditor::instance().get_grid_music_divisions (0); + 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(), false, true, divisions); + break; + case LocEnd: + location->set_end (end_clock.current_time(), false, true, divisions); + if (location->is_session_range()) { + _session->set_end_is_free (false); + } + break; + case LocLength: + location->set_end (location->start() + length_clock.current_duration(), false, true, divisions); + if (location->is_session_range()) { + _session->set_end_is_free (false); + } + default: + break; } } +void +LocationEditRow::show_cd_track_details () +{ + 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(); +} + void LocationEditRow::cd_toggled () { @@ -466,29 +533,9 @@ LocationEditRow::cd_toggled () location->set_cd (cd_check_button.get_active(), this); - if (location->is_cd_marker() && !(location->is_mark())) { - - 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 (location->is_cd_marker()) { - 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()){ @@ -574,7 +621,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *) +LocationEditRow::end_changed () { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) @@ -590,7 +637,7 @@ LocationEditRow::end_changed (ARDOUR::Location *) } void -LocationEditRow::start_changed (ARDOUR::Location*) +LocationEditRow::start_changed () { if (!location) return; @@ -609,7 +656,7 @@ LocationEditRow::start_changed (ARDOUR::Location*) } void -LocationEditRow::name_changed (ARDOUR::Location *) +LocationEditRow::name_changed () { if (!location) return; @@ -624,7 +671,7 @@ LocationEditRow::name_changed (ARDOUR::Location *) } void -LocationEditRow::location_changed (ARDOUR::Location*) +LocationEditRow::location_changed () { if (!location) return; @@ -642,7 +689,7 @@ LocationEditRow::location_changed (ARDOUR::Location*) } void -LocationEditRow::flags_changed (ARDOUR::Location*, void *) +LocationEditRow::flags_changed () { if (!location) { return; @@ -658,7 +705,7 @@ LocationEditRow::flags_changed (ARDOUR::Location*, void *) } void -LocationEditRow::lock_changed (ARDOUR::Location*) +LocationEditRow::lock_changed () { if (!location) { return; @@ -674,7 +721,7 @@ LocationEditRow::lock_changed (ARDOUR::Location*) } void -LocationEditRow::position_lock_style_changed (ARDOUR::Location*) +LocationEditRow::position_lock_style_changed () { if (!location) { return; @@ -703,13 +750,16 @@ LocationEditRow::set_clock_editable_status () /*------------------------------------------------------------------------*/ -LocationUI::LocationUI () +LocationUI::LocationUI (std::string state_node_name) : add_location_button (_("New Marker")) , add_range_button (_("New Range")) + , _mode (AudioClock::Frames) + , _mode_set (false) + , _state_node_name (state_node_name) { i_am_the_modifier = 0; - _clock_group = new ClockGroup; + _clock_group = new ClockGroup; VBox* vbox = manage (new VBox); @@ -724,9 +774,10 @@ 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_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); @@ -735,7 +786,7 @@ LocationUI::LocationUI () vbox->pack_start (*table, false, false); - table = manage (new Table (3, 2)); + table = manage (new Table (3, 2)); table->set_spacings (2); table->set_col_spacing (0, 32); table_row = 0; @@ -768,9 +819,9 @@ LocationUI::LocationUI () 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 = manage (new Table (3, 2)); table->set_spacings (2); table->set_col_spacing (0, 32); table_row = 0; @@ -800,7 +851,7 @@ LocationUI::LocationUI () 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); @@ -821,7 +872,9 @@ LocationUI::LocationUI () LocationUI::~LocationUI() { - delete _clock_group; + loop_edit_row.unset_clock_group (); + punch_edit_row.unset_clock_group (); + delete _clock_group; } gint @@ -836,12 +889,12 @@ 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; } @@ -881,8 +934,8 @@ LocationUI::location_added (Location* location) loc.sort (LocationSortByStart ()); LocationEditRow* erow = manage (new LocationEditRow (_session, location)); - - erow->set_clock_group (*_clock_group); + + 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 (); @@ -942,7 +995,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; @@ -951,9 +1004,8 @@ 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; @@ -964,7 +1016,7 @@ LocationUI::map_locations (Locations::LocationList& locations) 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(); + Box_Helpers::BoxList & loc_children = location_rows.children(); loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START)); } else if (location->is_auto_punch()) { punch_edit_row.set_session (_session); @@ -977,7 +1029,7 @@ LocationUI::map_locations (Locations::LocationList& locations) } else { LocationEditRow* erow = manage (new LocationEditRow(_session, location)); - erow->set_clock_group (*_clock_group); + 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(); @@ -998,15 +1050,15 @@ LocationUI::add_new_location() 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 (); } } @@ -1020,12 +1072,12 @@ LocationUI::add_new_range() 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 (); } } @@ -1057,11 +1109,13 @@ 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), 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 ()); + } else { + _mode_set = false; } loop_edit_row.set_session (s); @@ -1070,17 +1124,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() { @@ -1099,38 +1142,60 @@ LocationUI::session_going_away() punch_edit_row.set_session (0); punch_edit_row.set_location (0); + _mode_set = false; + 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 ())); + XMLNode* node = new XMLNode (_state_node_name); + node->set_property (X_("clock-mode"), _clock_group->clock_mode ()); return *node; } +int +LocationUI::set_state (const XMLNode& node) +{ + if (node.name() != _state_node_name) { + return -1; + } + + if (!node.get_property (X_("clock-mode"), _mode)) { + return -1; + } + + _mode_set = true; + _clock_group->set_clock_mode (_mode); + return 0; +} + AudioClock::Mode -LocationUI::clock_mode_from_session_instant_xml () const +LocationUI::clock_mode_from_session_instant_xml () { - XMLNode* node = _session->instant_xml (X_("LocationUI")); + if (_mode_set) { + return _mode; + } + + XMLNode* node = _session->instant_xml (_state_node_name); if (!node) { - return AudioClock::Frames; + return ARDOUR_UI::instance()->secondary_clock->mode(); } - XMLProperty* p = node->property (X_("clock-mode")); - if (!p) { - return AudioClock::Frames; + if (!node->get_property (X_("clock-mode"), _mode)) { + return ARDOUR_UI::instance()->secondary_clock->mode(); } - - return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode); + + _mode_set = true; + return _mode; } /*------------------------*/ LocationUIWindow::LocationUIWindow () - : ArdourWindow (_("Locations")) + : ArdourWindow (S_("Ranges|Locations")) { set_wmclass(X_("ardour_locations"), PROGRAM_NAME); set_name ("LocationWindow"); @@ -1152,8 +1217,7 @@ LocationUIWindow::on_map () bool LocationUIWindow::on_delete_event (GdkEventAny*) { - hide (); - return true; + return false; } void @@ -1161,6 +1225,7 @@ LocationUIWindow::set_session (Session *s) { ArdourWindow::set_session (s); _ui.set_session (s); + _ui.show_all (); } void