X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=ac7b227e5bfaabfc52c812c3d98d875f18f6285d;hb=7c5f1b7a26df60417590340d4cfe367ed00e180a;hp=e13366fd12d6a66b0a57944736a121451f94c640;hpb=d6ef740e9002c7112bc47cb2d9d8d4b8609aa089;p=ardour.git diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index e13366fd12..ac7b227e5b 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,12 +21,11 @@ #include #include -#include -#include -#include -#include -#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" @@ -37,40 +36,42 @@ #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) - : location(0), session(0), - item_table (1, 7, false), - start_set_button (_("Set")), - start_go_button (_("Go")), - start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true), - end_set_button (_("Set")), - end_go_button (_("Go")), - end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true), - length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, true), + : 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 (_("Hidden")), - remove_button (_("Remove")), + hide_check_button (_("Hide")), + lock_check_button (_("Lock")), + glue_check_button (_("Glue")), scms_check_button (_("SCMS")), preemph_check_button (_("Pre-Emphasis")) { - 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_set_button.set_name ("LocationEditSetButton"); start_go_button.set_name ("LocationEditGoButton"); - end_set_button.set_name ("LocationEditSetButton"); 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"); @@ -81,7 +82,6 @@ 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: "); @@ -99,6 +99,8 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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); @@ -108,51 +110,41 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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 (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); - performer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::performer_entry_changed)); - composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed)); - scms_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::scms_toggled)); - preemph_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::preemph_toggled)); - + 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); - - item_table.attach (number_label, 0, 1, 0, 1, FILL, FILL, 3, 0); - - start_hbox.pack_start (start_go_button, false, false); + // start_hbox.pack_start (start_go_button, false, false); start_hbox.pack_start (start_clock, false, false); - start_hbox.pack_start (start_set_button, false, false); - item_table.attach (start_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0); + /* this is always in this location, no matter what the location is */ - - start_set_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::set_button_pressed), LocStart)); - start_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart)); - start_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocStart)); + item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0); - - end_hbox.pack_start (end_go_button, false, false); + 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_hbox.pack_start (end_set_button, false, false); - - //item_table.attach (end_hbox, 2, 3, 0, 1, 0, 0, 4, 0); - - end_set_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::set_button_pressed), LocEnd)); - end_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); - end_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocEnd)); - -// item_table.attach (length_clock, 3, 4, 0, 1, 0, 0, 4, 0); - length_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocLength)); -// item_table.attach (cd_check_button, 4, 5, 0, 1, 0, Gtk::FILL, 4, 0); -// item_table.attach (hide_check_button, 5, 6, 0, 1, 0, Gtk::FILL, 4, 0); -// item_table.attach (remove_button, 7, 8, 0, 1, 0, Gtk::FILL, 4, 0); - - cd_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::cd_toggled)); - hide_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::hide_toggled)); - - remove_button.signal_clicked().connect(mem_fun(*this, &LocationEditRow::remove_button_pressed)); + 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)); + 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); @@ -163,25 +155,23 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) LocationEditRow::~LocationEditRow() { if (location) { - start_changed_connection.disconnect(); - end_changed_connection.disconnect(); - name_changed_connection.disconnect(); - changed_connection.disconnect(); - flags_changed_connection.disconnect(); + connections.drop_connections (); } } void LocationEditRow::set_session (Session *sess) { - session = sess; + SessionHandlePtr::set_session (sess); - if (!session) return; + if (!_session) { + return; + } + + start_clock.set_session (_session); + end_clock.set_session (_session); + length_clock.set_session (_session); - start_clock.set_session (session); - end_clock.set_session (session); - length_clock.set_session (session); - } void @@ -198,11 +188,7 @@ void LocationEditRow::set_location (Location *loc) { if (location) { - start_changed_connection.disconnect(); - end_changed_connection.disconnect(); - name_changed_connection.disconnect(); - changed_connection.disconnect(); - flags_changed_connection.disconnect(); + connections.drop_connections (); } location = loc; @@ -210,10 +196,14 @@ LocationEditRow::set_location (Location *loc) if (!location) return; if (!hide_check_button.get_parent()) { - item_table.attach (hide_check_button, 6, 7, 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()); + glue_check_button.set_active (location->position_lock_style() == MusicTime); + if (location->is_auto_loop() || location-> is_auto_punch()) { // use label instead of entry @@ -221,9 +211,9 @@ LocationEditRow::set_location (Location *loc) name_label.set_size_request (80, -1); if (!name_label.get_parent()) { - item_table.attach (name_label, 1, 2, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (name_label, 0, 1, 0, 1, FILL, FILL, 4, 0); } - + name_label.show(); } else { @@ -231,71 +221,91 @@ LocationEditRow::set_location (Location *loc) name_entry.set_text (location->name()); name_entry.set_size_request (100, -1); name_entry.set_editable (true); - name_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::name_entry_changed)); + 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, 0, 1, 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::FILL, 4, 0); + item_table.attach (cd_check_button, 4, 5, 0, 1, FILL, FILL, 4, 0); } if (!remove_button.get_parent()) { - item_table.attach (remove_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (remove_button, 8, 9, 0, 1, FILL, FILL, 4, 0); } - /* XXX i can't find a way to hide the button without messing up - the row spacing, so make it insensitive (paul). - */ - - 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()) { + 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); - + if (!location->is_mark()) { if (!end_hbox.get_parent()) { - item_table.attach (end_hbox, 3, 4, 0, 1, FILL, FILL, 4, 0); + item_table.attach (end_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0); } if (!length_clock.get_parent()) { - item_table.attach (length_clock, 4, 5, 0, 1, FILL, FILL, 4, 0); + item_table.attach (length_clock, 3, 4, 0, 1, FILL, FILL, 4, 0); } end_clock.set (location->end(), true); length_clock.set (location->length(), true); - end_set_button.show(); end_go_button.show(); end_clock.show(); length_clock.show(); - } - else { - end_set_button.hide(); + + ARDOUR_UI::instance()->set_tip (end_go_button, _("Jump to the end of this range")); + ARDOUR_UI::instance()->set_tip (start_go_button, _("Jump to the start of this range")); + ARDOUR_UI::instance()->set_tip (remove_button, _("Forget this range")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Start time")); + ARDOUR_UI::instance()->set_tip (end_clock, _("End time")); + ARDOUR_UI::instance()->set_tip (length_clock, _("Length")); + + } else { + + ARDOUR_UI::instance()->set_tip (start_go_button, _("Jump to this marker")); + ARDOUR_UI::instance()->set_tip (remove_button, _("Forget this marker")); + ARDOUR_UI::instance()->set_tip (start_clock, _("Position")); + end_go_button.hide(); end_clock.hide(); length_clock.hide(); } - start_changed_connection = location->start_changed.connect (mem_fun(*this, &LocationEditRow::start_changed)); - end_changed_connection = location->end_changed.connect (mem_fun(*this, &LocationEditRow::end_changed)); - name_changed_connection = location->name_changed.connect (mem_fun(*this, &LocationEditRow::name_changed)); - changed_connection = location->changed.connect (mem_fun(*this, &LocationEditRow::location_changed)); - flags_changed_connection = location->FlagsChanged.connect (mem_fun(*this, &LocationEditRow::flags_changed)); - + start_clock.set_sensitive (!location->locked()); + end_clock.set_sensitive (!location->locked()); + length_clock.set_sensitive (!location->locked()); + + 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(mem_fun(*this, &LocationEditRow::name_entry_changed)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed) if (i_am_the_modifier || !location) return; location->set_name (name_entry.get_text()); @@ -305,14 +315,14 @@ LocationEditRow::name_entry_changed () void LocationEditRow::isrc_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*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(); - + } else { location->cd_info.erase("isrc"); } @@ -321,8 +331,8 @@ LocationEditRow::isrc_entry_changed () void LocationEditRow::performer_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*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() != "") { @@ -335,8 +345,8 @@ LocationEditRow::performer_entry_changed () void LocationEditRow::composer_entry_changed () { - ENSURE_GUI_THREAD(mem_fun(*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() != "") { @@ -347,23 +357,6 @@ LocationEditRow::composer_entry_changed () } -void -LocationEditRow::set_button_pressed (LocationPart part) -{ - if (!location) return; - - switch (part) { - case LocStart: - location->set_start (session->transport_frame ()); - break; - case LocEnd: - location->set_end (session->transport_frame ()); - break; - default: - break; - } -} - void LocationEditRow::go_button_pressed (LocationPart part) { @@ -385,7 +378,7 @@ void LocationEditRow::clock_changed (LocationPart part) { if (i_am_the_modifier || !location) return; - + switch (part) { case LocStart: location->set_start (start_clock.current_time()); @@ -401,61 +394,113 @@ LocationEditRow::clock_changed (LocationPart part) } +void +LocationEditRow::change_aborted (LocationPart /*part*/) +{ + if (i_am_the_modifier || !location) return; + + set_location(location); +} + void LocationEditRow::cd_toggled () { + if (i_am_the_modifier || !location) { + return; + } + + //if (cd_check_button.get_active() == location->is_cd_marker()) { + // return; + //} + + if (cd_check_button.get_active()) { + 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; + } + } - if (i_am_the_modifier || !location) return; 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(!cd_track_details_hbox.get_parent()) { - item_table.attach (cd_track_details_hbox, 1, 8, 1, 2, FILL | EXPAND, FILL, 4, 0); - } - // item_table.resize(2, 7); - cd_track_details_hbox.show_all(); + 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(); } else if (cd_track_details_hbox.get_parent()){ - item_table.remove (cd_track_details_hbox); - // item_table.resize(1, 7); - redraw_ranges(); /* EMIT_SIGNAL */ + item_table.remove (cd_track_details_hbox); + // item_table.resize(1, 7); + redraw_ranges(); /* EMIT_SIGNAL */ } - } - 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 */ } @@ -470,7 +515,7 @@ LocationEditRow::scms_toggled () } else { location->cd_info.erase("scms"); } - + } void @@ -488,39 +533,45 @@ LocationEditRow::preemph_toggled () void LocationEditRow::end_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::end_changed), loc)); + ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) if (!location) return; - + // update end and length i_am_the_modifier++; end_clock.set (location->end()); length_clock.set (location->length()); - + i_am_the_modifier--; } void LocationEditRow::start_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::start_changed), loc)); - + ENSURE_GUI_THREAD (*this, &LocationEditRow::start_changed, loc) + if (!location) return; - + // update end and length i_am_the_modifier++; start_clock.set (location->start()); - + + if (location->start() == _session->current_start_frame()) { + cd_check_button.set_sensitive (false); + } else { + cd_check_button.set_sensitive (true); + } + i_am_the_modifier--; } void LocationEditRow::name_changed (ARDOUR::Location *loc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::name_changed), loc)); - + ENSURE_GUI_THREAD (*this, &LocationEditRow::name_changed, loc) + if (!location) return; // update end and length @@ -535,9 +586,9 @@ LocationEditRow::name_changed (ARDOUR::Location *loc) void LocationEditRow::location_changed (ARDOUR::Location *loc) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::location_changed), loc)); - +{ + ENSURE_GUI_THREAD (*this, &LocationEditRow::location_changed, loc) + if (!location) return; i_am_the_modifier++; @@ -546,6 +597,10 @@ 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()); + i_am_the_modifier--; } @@ -553,37 +608,72 @@ LocationEditRow::location_changed (ARDOUR::Location *loc) void LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src) { - ENSURE_GUI_THREAD(bind (mem_fun(*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--; } -LocationUI::LocationUI () - : ArdourDialog ("location dialog"), - add_location_button (_("Add New Location")), - add_range_button (_("Add New Range")) +void +LocationEditRow::lock_changed (ARDOUR::Location *loc) { - i_am_the_modifier = 0; + if (!location) { + return; + } - set_title(_("ardour: locations")); - set_wmclass(X_("ardour_locations"), "Ardour"); + i_am_the_modifier++; - set_name ("LocationWindow"); + lock_check_button.set_active (location->locked()); - get_vbox()->pack_start (location_hpacker); + i_am_the_modifier--; +} + +void +LocationEditRow::position_lock_style_changed (ARDOUR::Location* loc) +{ + if (!location) { + return; + } + + i_am_the_modifier++; + + glue_check_button.set_active (location->position_lock_style() == MusicTime); + + i_am_the_modifier--; +} + +void +LocationEditRow::focus_name() { + name_entry.grab_focus(); +} + + +LocationUI::LocationUI () + : add_location_button (_("New Marker")) + , add_range_button (_("New Range")) +{ + i_am_the_modifier = 0; - location_vpacker.set_border_width (10); 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))); - location_vpacker.pack_start (loop_edit_row, false, false); - location_vpacker.pack_start (punch_edit_row, false, false); + 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); location_rows.set_name("LocationLocRows"); location_rows_scroller.add (location_rows); @@ -591,140 +681,178 @@ LocationUI::LocationUI () location_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); location_rows_scroller.set_size_request (-1, 130); + newest_location = 0; + loc_frame_box.set_spacing (5); loc_frame_box.set_border_width (5); loc_frame_box.set_name("LocationFrameBox"); - + loc_frame_box.pack_start (location_rows_scroller, true, true); add_location_button.set_name ("LocationAddLocationButton"); - loc_frame_box.pack_start (add_location_button, false, false); + + 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); loc_frame.set_name ("LocationLocEditorFrame"); - loc_frame.set_label (_("Location (CD Index) Markers")); + loc_frame.set_label (_("Markers (including CD index)")); loc_frame.add (loc_frame_box); loc_range_panes.pack1(loc_frame, true, false); - + range_rows.set_name("LocationRangeRows"); range_rows_scroller.add (range_rows); range_rows_scroller.set_name ("LocationRangeRowsScroller"); range_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); range_rows_scroller.set_size_request (-1, 130); - + range_frame_box.set_spacing (5); range_frame_box.set_name("LocationFrameBox"); range_frame_box.set_border_width (5); 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); + //range_frame_box.pack_start (add_range_button, false, false); + + add_button_box->pack_start (add_range_button, true, true); range_frame.set_name ("LocationRangeEditorFrame"); - range_frame.set_label (_("Range (CD Track) Markers")); + 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_hpacker.pack_start (location_vpacker, true, true); + location_vpacker.pack_start (*add_button_box, false, false); - add_location_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_location)); - add_range_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_range)); - - //add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK); + pack_start (location_vpacker, true, true); + 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 (); } LocationUI::~LocationUI() { } - - -gint LocationUI::do_location_remove (ARDOUR::Location *loc) +gint +LocationUI::do_location_remove (ARDOUR::Location *loc) { /* this is handled internally by Locations, but there's no point saving state etc. when we know the marker 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 LocationUI::location_remove_requested (ARDOUR::Location *loc) +void +LocationUI::location_remove_requested (ARDOUR::Location *loc) { // must do this to prevent problems when destroying // the effective sender of this event - - Glib::signal_idle().connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc)); + + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &LocationUI::do_location_remove), loc)); } -void LocationUI::location_redraw_ranges () +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(bind (mem_fun(*this, &LocationUI::location_added), 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->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 (); } } void LocationUI::location_removed (Location* location) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_removed), location)); - + ENSURE_GUI_THREAD (*this, &LocationUI::location_removed, 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; + gint n; int mark_n = 0; Locations::LocationList temp = locations; LocationSortByStart cmp; @@ -732,32 +860,32 @@ 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)); - erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested)); - erow->redraw_ranges.connect (mem_fun(*this, &LocationUI::location_redraw_ranges)); + LocationEditRow* erow = manage (new LocationEditRow (_session, location, mark_n)); + erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested)); + erow->redraw_ranges.connect (sigc::mem_fun(*this, &LocationUI::location_redraw_ranges)); + 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); + 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); - } - else if (location->is_auto_loop()) { - loop_edit_row.set_session (session); + punch_edit_row.show_all(); + } else if (location->is_auto_loop()) { + loop_edit_row.set_session (_session); loop_edit_row.set_location (location); - } - else { - erow = manage (new LocationEditRow(session, location)); - erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested)); + loop_edit_row.show_all(); + } else { + LocationEditRow* erow = manage (new LocationEditRow(_session, location)); + 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)); } } @@ -771,18 +899,21 @@ 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); - 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 (); + if (_session) { + nframes_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 (); } - + } void @@ -790,67 +921,73 @@ 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) { + nframes_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(bind (mem_fun(*this, &LocationUI::refresh_location_list_s), ignored)); - - refresh_location_list (); -} - void LocationUI::refresh_location_list () { - ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list)); + ENSURE_GUI_THREAD (*this, &LocationUI::refresh_location_list) using namespace Box_Helpers; + // this is just too expensive to do when window is not shown + if (!is_visible()) return; + BoxList & loc_children = location_rows.children(); BoxList & range_children = range_rows.children(); 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* sess) +LocationUI::set_session(ARDOUR::Session* s) { - ArdourDialog::set_session (sess); + SessionHandlePtr::set_session (s); - if (session) { - session->locations()->changed.connect (mem_fun(*this, &LocationUI::refresh_location_list)); - session->locations()->StateChanged.connect (mem_fun(*this, &LocationUI::refresh_location_list_s)); - session->locations()->added.connect (mem_fun(*this, &LocationUI::location_added)); - session->locations()->removed.connect (mem_fun(*this, &LocationUI::location_removed)); - session->GoingAway.connect (mem_fun(*this, &LocationUI::session_gone)); + 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()); } + + 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(mem_fun(*this, &LocationUI::session_gone)); - - hide_all(); + /* 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(); @@ -865,12 +1002,48 @@ LocationUI::session_gone() punch_edit_row.set_session (0); punch_edit_row.set_location (0); - ArdourDialog::session_gone (); + SessionHandlePtr::session_going_away (); +} + +/*------------------------*/ + +LocationUIWindow::LocationUIWindow () + : ArdourDialog (_("Locations")) +{ + set_wmclass(X_("ardour_locations"), "Ardour"); + set_name ("LocationWindow"); + + get_vbox()->pack_start (_ui); +} + +LocationUIWindow::~LocationUIWindow() +{ +} + +void +LocationUIWindow::on_show() +{ + _ui.refresh_location_list(); + ArdourDialog::on_show(); } bool -LocationUI::on_delete_event (GdkEventAny* ev) +LocationUIWindow::on_delete_event (GdkEventAny*) { hide (); return true; } + +void +LocationUIWindow::set_session (Session *s) +{ + ArdourDialog::set_session (s); + _ui.set_session (s); +} + +void +LocationUIWindow::session_going_away () +{ + ArdourDialog::session_going_away (); + hide_all(); +}