X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=689706ba01bb141e32027b980da4ab9bb94b9ef4;hb=18efe8f446f45b541f19a2f99dd707f66fb72a3e;hp=60e0be567667fdf276853f23aa7417d6121dcd24;hpb=ec1ef5d6b574258d6451aa60749c4241f3c42f5f;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 60e0be5676..689706ba01 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -22,13 +22,12 @@ #include -#include "ardour/utils.h" -#include "ardour/configuration.h" #include "ardour/session.h" #include "pbd/memento_command.h" #include "ardour_ui.h" #include "clock_group.h" +#include "main_clock.h" #include "gui_thread.h" #include "keyboard.h" #include "location_ui.h" @@ -39,6 +38,7 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; @@ -62,6 +62,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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"); @@ -161,6 +164,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) set_location (loc); set_number (num); + cd_toggled(); // show/hide cd-track details } LocationEditRow::~LocationEditRow() @@ -305,6 +309,10 @@ LocationEditRow::set_location (Location *loc) end_clock.show(); length_clock.show(); + if (location->is_cd_marker()) { + show_cd_track_details (); + } + 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")); @@ -324,17 +332,19 @@ LocationEditRow::set_location (Location *loc) length_clock.hide(); } - set_clock_sensitivity (); + set_clock_editable_status (); --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 @@ -444,6 +454,34 @@ LocationEditRow::clock_changed (LocationPart part) } } +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 () { @@ -465,29 +503,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()){ @@ -573,7 +591,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *) +LocationEditRow::end_changed () { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) @@ -589,7 +607,7 @@ LocationEditRow::end_changed (ARDOUR::Location *) } void -LocationEditRow::start_changed (ARDOUR::Location*) +LocationEditRow::start_changed () { if (!location) return; @@ -608,7 +626,7 @@ LocationEditRow::start_changed (ARDOUR::Location*) } void -LocationEditRow::name_changed (ARDOUR::Location *) +LocationEditRow::name_changed () { if (!location) return; @@ -623,7 +641,7 @@ LocationEditRow::name_changed (ARDOUR::Location *) } void -LocationEditRow::location_changed (ARDOUR::Location*) +LocationEditRow::location_changed () { if (!location) return; @@ -634,14 +652,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; @@ -657,7 +675,7 @@ LocationEditRow::flags_changed (ARDOUR::Location*, void *) } void -LocationEditRow::lock_changed (ARDOUR::Location*) +LocationEditRow::lock_changed () { if (!location) { return; @@ -667,13 +685,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; @@ -687,16 +705,17 @@ 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_sensitivity () +LocationEditRow::set_clock_editable_status () { - start_clock.set_sensitive (!location->locked()); - end_clock.set_sensitive (!location->locked()); - length_clock.set_sensitive (!location->locked()); + start_clock.set_editable (!location->locked()); + end_clock.set_editable (!location->locked()); + length_clock.set_editable (!location->locked()); } /*------------------------------------------------------------------------*/ @@ -862,9 +881,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 @@ -879,7 +898,7 @@ 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)); @@ -910,6 +929,11 @@ LocationUI::location_added (Location* location) range_rows.show_all (); location_rows.show_all (); + + if (location == newest_location) { + newest_location = 0; + erow->focus_name(); + } } } @@ -935,7 +959,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; @@ -944,9 +968,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; @@ -959,10 +982,6 @@ LocationUI::map_locations (Locations::LocationList& locations) 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); @@ -1054,10 +1073,10 @@ 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 ()); } @@ -1067,17 +1086,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() { @@ -1117,7 +1125,7 @@ LocationUI::clock_mode_from_session_instant_xml () const XMLProperty* p = node->property (X_("clock-mode")); if (!p) { - return AudioClock::Frames; + return ARDOUR_UI::instance()->secondary_clock->mode(); } return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode); @@ -1149,8 +1157,7 @@ LocationUIWindow::on_map () bool LocationUIWindow::on_delete_event (GdkEventAny*) { - hide (); - return true; + return false; } void @@ -1158,6 +1165,7 @@ LocationUIWindow::set_session (Session *s) { ArdourWindow::set_session (s); _ui.set_session (s); + _ui.show_all (); } void