#include <gtkmm2ext/utils.h>
-#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"
, location(0)
, item_table (1, 6, false)
, start_clock (X_("locationstart"), true, "", true, false)
+ , start_to_playhead_button (_("Use PH"))
, end_clock (X_("locationend"), true, "", true, false)
+ , end_to_playhead_button (_("Use PH"))
, length_clock (X_("locationlength"), true, "", true, false, true)
, cd_check_button (_("CD"))
, hide_check_button (_("Hide"))
, lock_check_button (_("Lock"))
, glue_check_button (_("Glue"))
- , scms_check_button (_("SCMS"))
- , preemph_check_button (_("Pre-Emphasis"))
, _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_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");
- 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");
composer_label.set_name ("LocationEditNumberLabel");
composer_entry.set_name ("LocationEditNameEntry");
- Gtk::Button* start_to_playhead_button = manage (new Button (_("Use PH")));
- Gtk::Button* end_to_playhead_button = manage (new Button (_("Use PH")));
-
- ARDOUR_UI::instance()->tooltips().set_tip (*start_to_playhead_button, _("Set value to playhead"));
- ARDOUR_UI::instance()->tooltips().set_tip (*end_to_playhead_button, _("Set value to playhead"));
-
- 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);
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));
set_session (sess);
- start_hbox.pack_start (start_go_button, false, false);
+ start_hbox.set_spacing (2);
start_hbox.pack_start (start_clock, false, false);
- start_hbox.pack_start (*start_to_playhead_button, 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);
+ 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_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart));
- start_to_playhead_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocStart));
+ 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.pack_start (end_go_button, false, 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_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));
+ 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));
++i_am_the_modifier;
if (!hide_check_button.get_parent()) {
- item_table.attach (hide_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0);
- item_table.attach (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);
+ item_table.attach (hide_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0);
+ item_table.attach (lock_check_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
+ item_table.attach (glue_check_button, 8, 9, 0, 1, FILL, Gtk::FILL, 4, 0);
}
hide_check_button.set_active (location->is_hidden());
lock_check_button.set_active (location->locked());
name_label.set_text (location->name());
name_label.set_size_request (80, -1);
+ remove_button.hide ();
+
if (!name_label.get_parent()) {
- item_table.attach (name_label, 0, 1, 0, 1, FILL, FILL, 4, 0);
+ item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0);
}
name_label.show();
name_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::name_entry_changed));
if (!name_entry.get_parent()) {
- item_table.attach (name_entry, 0, 1, 0, 1, FILL | EXPAND, FILL, 4, 0);
+ item_table.attach (name_entry, 1, 2, 0, 1, FILL | EXPAND, FILL, 4, 0);
}
name_entry.show();
if (!cd_check_button.get_parent()) {
- item_table.attach (cd_check_button, 4, 5, 0, 1, FILL, FILL, 4, 0);
- }
- if (!remove_button.get_parent()) {
- item_table.attach (remove_button, 8, 9, 0, 1, FILL, FILL, 4, 0);
+ item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0);
}
if (location->is_session_range()) {
if (!location->is_mark()) {
if (!end_hbox.get_parent()) {
- item_table.attach (end_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0);
+ item_table.attach (end_hbox, 3, 4, 0, 1, FILL, Gtk::AttachOptions (0), 4, 0);
}
if (!length_clock.get_parent()) {
- item_table.attach (length_clock, 3, 4, 0, 1, FILL, FILL, 4, 0);
+ end_hbox.pack_start (length_clock, false, false);
}
end_clock.set (location->end(), true);
length_clock.set (location->length(), true);
- end_go_button.show();
end_clock.show();
length_clock.show();
- ARDOUR_UI::instance()->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 (remove_button, _("Remove this range"));
+ ARDOUR_UI::instance()->set_tip (start_clock, _("Start time - middle click to locate here"));
+ ARDOUR_UI::instance()->set_tip (end_clock, _("End time - middle click to locate here"));
ARDOUR_UI::instance()->set_tip (length_clock, _("Length"));
+ ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set range start from playhead location"));
+ ARDOUR_UI::instance()->tooltips().set_tip (end_to_playhead_button, _("Set range end from playhead location"));
+
} else {
- ARDOUR_UI::instance()->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"));
+ ARDOUR_UI::instance()->set_tip (remove_button, _("Remove this marker"));
+ ARDOUR_UI::instance()->set_tip (start_clock, _("Position - middle click to locate here"));
+
+ ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set marker time from playhead location"));
- end_go_button.hide();
end_clock.hide();
length_clock.hide();
}
- 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());
+ 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());
}
void
}
}
-
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 ());
+ location->set_start (_session->transport_frame ());
break;
case LocEnd:
- ARDOUR_UI::instance()->do_transport_locate (location->end(), _session->transport_rolling ());
+ location->set_end (_session->transport_frame ());
break;
default:
break;
}
}
-void
-LocationEditRow::to_playhead_button_pressed (LocationPart part)
+bool
+LocationEditRow::locate_to_clock (GdkEventButton* ev, AudioClock* clock)
{
- 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;
+ if (Keyboard::is_button2_event (ev)) {
+ _session->request_locate (clock->current_time());
+ return true;
}
+ return false;
}
void
end_clock.set (location->end());
length_clock.set (location->length());
- set_clock_sensitivity ();
+ set_clock_editable_status ();
i_am_the_modifier--;
lock_check_button.set_active (location->locked());
- set_clock_sensitivity ();
+ set_clock_editable_status ();
i_am_the_modifier--;
}
}
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());
}
/*------------------------------------------------------------------------*/
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;
vbox->pack_start (*table, false, false);
table = manage (new Table (3, 2));
- table->set_spacings (4);
+ table->set_spacings (2);
table->set_col_spacing (0, 32);
table_row = 0;
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);
table = manage (new Table (3, 2));
- table->set_spacings (4);
+ table->set_spacings (2);
table->set_col_spacing (0, 32);
table_row = 0;
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);
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()
}
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
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));
range_rows.show_all ();
location_rows.show_all ();
+
+ if (location == newest_location) {
+ newest_location = 0;
+ erow->focus_name();
+ }
}
}
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);
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());
_clock_group->set_clock_mode (clock_mode_from_session_instant_xml ());
}
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);
projects / ardour.git / blobdiff