X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=c27dbafcc7f5dce81434aad9576732091291e70b;hb=4901f9d1d20ea5878b34db025a3dc305d3a78c2e;hp=849ce9de221477419fe9ad5bf23b3a6f20c9b66a;hpb=b3ddcbcee491a48091f9b4b927c953cbcd0e8963;p=ardour.git
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 849ce9de22..c27dbafcc7 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -45,30 +45,26 @@ using namespace Gtkmm2ext;
LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
: SessionHandlePtr (0) /* explicitly set below */
- , location(0)
+ , 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)
+ , 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)));
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");
@@ -83,12 +79,11 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
composer_label.set_name ("LocationEditNumberLabel");
composer_entry.set_name ("LocationEditNameEntry");
- isrc_label.set_text ("ISRC: ");
- isrc_label.set_size_request (30, -1);
- performer_label.set_text ("Performer: ");
- performer_label.set_size_request (60, -1);
- composer_label.set_text ("Composer: ");
- composer_label.set_size_request (60, -1);
+ isrc_label.set_text (X_("ISRC:"));
+ performer_label.set_text (_("Performer:"));
+ composer_label.set_text (_("Composer:"));
+ scms_label.set_text (X_("SCMS"));
+ preemph_label.set_text (_("Pre-Emphasis"));
isrc_entry.set_size_request (112, -1);
isrc_entry.set_max_length(12);
@@ -102,14 +97,24 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
name_label.set_alignment (0, 0.5);
+ Gtk::HBox* front_spacing = manage (new HBox);
+ front_spacing->set_size_request (20, -1);
+ Gtk::HBox* mid_spacing = manage (new HBox);
+ mid_spacing->set_size_request (20, -1);
+
+ cd_track_details_hbox.set_spacing (4);
+ cd_track_details_hbox.pack_start (*front_spacing, false, false);
cd_track_details_hbox.pack_start (isrc_label, false, false);
cd_track_details_hbox.pack_start (isrc_entry, false, false);
- cd_track_details_hbox.pack_start (scms_check_button, false, false);
- cd_track_details_hbox.pack_start (preemph_check_button, false, false);
cd_track_details_hbox.pack_start (performer_label, false, false);
cd_track_details_hbox.pack_start (performer_entry, true, true);
cd_track_details_hbox.pack_start (composer_label, false, false);
cd_track_details_hbox.pack_start (composer_entry, true, true);
+ cd_track_details_hbox.pack_start (*mid_spacing, false, false);
+ cd_track_details_hbox.pack_start (scms_label, false, false);
+ cd_track_details_hbox.pack_start (scms_check_button, false, false);
+ cd_track_details_hbox.pack_start (preemph_label, false, false);
+ cd_track_details_hbox.pack_start (preemph_check_button, false, false);
isrc_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::isrc_entry_changed));
performer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::performer_entry_changed));
@@ -119,26 +124,31 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
set_session (sess);
- start_hbox.pack_start (start_go_button, false, false);
+ start_hbox.set_spacing (2);
start_hbox.pack_start (start_clock, false, false);
+ start_hbox.pack_start (start_to_playhead_button, false, false);
/* this is always in this location, no matter what the location is */
- item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0);
+ 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_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart));
- start_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocStart));
+ start_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_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_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd));
- end_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocEnd));
+ end_clock.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_to_clock), &end_clock), false);
length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
- length_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocLength));
cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled));
hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled));
@@ -187,14 +197,13 @@ LocationEditRow::set_session (Session *sess)
{
SessionHandlePtr::set_session (sess);
- if (!_session) {
+ if (!_session) {
return;
}
start_clock.set_session (_session);
end_clock.set_session (_session);
length_clock.set_session (_session);
-
}
void
@@ -223,9 +232,9 @@ LocationEditRow::set_location (Location *loc)
++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());
@@ -237,8 +246,10 @@ LocationEditRow::set_location (Location *loc)
name_label.set_text (location->name());
name_label.set_size_request (80, -1);
+ remove_button.hide ();
+
if (!name_label.get_parent()) {
- item_table.attach (name_label, 0, 1, 0, 1, FILL, FILL, 4, 0);
+ item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0);
}
name_label.show();
@@ -251,15 +262,12 @@ LocationEditRow::set_location (Location *loc)
name_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::name_entry_changed));
if (!name_entry.get_parent()) {
- item_table.attach (name_entry, 0, 1, 0, 1, FILL | EXPAND, FILL, 4, 0);
+ item_table.attach (name_entry, 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()) {
@@ -285,33 +293,33 @@ LocationEditRow::set_location (Location *loc)
if (!location->is_mark()) {
if (!end_hbox.get_parent()) {
- item_table.attach (end_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0);
+ item_table.attach (end_hbox, 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();
}
@@ -333,7 +341,7 @@ void
LocationEditRow::name_entry_changed ()
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed)
-
+
if (i_am_the_modifier || !location) {
return;
}
@@ -386,9 +394,8 @@ LocationEditRow::composer_entry_changed ()
}
}
-
void
-LocationEditRow::go_button_pressed (LocationPart part)
+LocationEditRow::to_playhead_button_pressed (LocationPart part)
{
if (!location) {
return;
@@ -396,16 +403,26 @@ LocationEditRow::go_button_pressed (LocationPart part)
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;
}
}
+bool
+LocationEditRow::locate_to_clock (GdkEventButton* ev, AudioClock* clock)
+{
+ if (Keyboard::is_button2_event (ev)) {
+ _session->request_locate (clock->current_time());
+ return true;
+ }
+ return false;
+}
+
void
LocationEditRow::clock_changed (LocationPart part)
{
@@ -427,14 +444,6 @@ 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 ()
{
@@ -564,7 +573,7 @@ LocationEditRow::preemph_toggled ()
}
void
-LocationEditRow::end_changed (ARDOUR::Location *loc)
+LocationEditRow::end_changed (ARDOUR::Location *)
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc)
@@ -699,12 +708,11 @@ LocationUI::LocationUI ()
i_am_the_modifier = 0;
_clock_group = new ClockGroup;
- _clock_group->set_clock_mode (AudioClock::Frames);
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;
@@ -719,20 +727,20 @@ LocationUI::LocationUI ()
loop_punch_box.pack_start (loop_edit_row, false, false);
loop_punch_box.pack_start (punch_edit_row, false, false);
-
+
table->attach (loop_punch_box, 1, 2, table_row, table_row + 1);
++table_row;
vbox->pack_start (*table, false, false);
-
+
table = manage (new Table (3, 2));
- table->set_spacings (4);
+ table->set_spacings (2);
table->set_col_spacing (0, 32);
table_row = 0;
table->attach (*manage (new Label ("")), 0, 2, table_row, table_row + 1, Gtk::SHRINK, Gtk::SHRINK);
++table_row;
-
+
l = manage (new Label (_("Markers (Including CD Index)")));
l->set_alignment (0, 0.5);
l->set_use_markup (true);
@@ -755,19 +763,19 @@ LocationUI::LocationUI ()
add_location_button.set_name ("LocationAddLocationButton");
- table->attach (loc_frame_box, 1, 2, table_row, table_row + 1);
+ table->attach (loc_frame_box, 0, 2, table_row, table_row + 1);
++table_row;
loc_range_panes.pack1 (*table, true, false);
table = manage (new Table (3, 2));
- table->set_spacings (4);
+ table->set_spacings (2);
table->set_col_spacing (0, 32);
table_row = 0;
table->attach (*manage (new Label ("")), 0, 2, table_row, table_row + 1, Gtk::SHRINK, Gtk::SHRINK);
++table_row;
-
+
l = manage (new Label (_("Ranges (Including CD Track Ranges)")));
l->set_alignment (0, 0.5);
l->set_use_markup (true);
@@ -787,7 +795,7 @@ LocationUI::LocationUI ()
add_range_button.set_name ("LocationAddRangeButton");
- table->attach (range_frame_box, 1, 2, table_row, table_row + 1);
+ table->attach (range_frame_box, 0, 2, table_row, table_row + 1);
++table_row;
loc_range_panes.pack2 (*table, true, false);
@@ -803,8 +811,10 @@ LocationUI::LocationUI ()
add_location_button.signal_clicked().connect (sigc::mem_fun(*this, &LocationUI::add_new_location));
add_range_button.signal_clicked().connect (sigc::mem_fun(*this, &LocationUI::add_new_range));
-
+
show_all ();
+
+ signal_map().connect (sigc::mem_fun (*this, &LocationUI::refresh_location_list));
}
LocationUI::~LocationUI()
@@ -812,7 +822,7 @@ LocationUI::~LocationUI()
delete _clock_group;
}
-gint
+gint
LocationUI::do_location_remove (ARDOUR::Location *loc)
{
/* this is handled internally by Locations, but there's
@@ -834,7 +844,7 @@ LocationUI::do_location_remove (ARDOUR::Location *loc)
return FALSE;
}
-void
+void
LocationUI::location_remove_requested (ARDOUR::Location *loc)
{
// must do this to prevent problems when destroying
@@ -844,7 +854,7 @@ LocationUI::location_remove_requested (ARDOUR::Location *loc)
}
-void
+void
LocationUI::location_redraw_ranges ()
{
range_rows.hide();
@@ -892,7 +902,7 @@ LocationUI::location_added (Location* location)
}
++i;
-
+
if (j != children.end()) {
++j;
}
@@ -943,7 +953,7 @@ LocationUI::map_locations (Locations::LocationList& locations)
if (location->is_mark()) {
LocationEditRow* erow = manage (new LocationEditRow (_session, location, mark_n));
- erow->set_clock_group (*_clock_group);
+ erow->set_clock_group (*_clock_group);
erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested));
erow->redraw_ranges.connect (sigc::mem_fun(*this, &LocationUI::location_redraw_ranges));
@@ -1023,7 +1033,9 @@ LocationUI::refresh_location_list ()
using namespace Box_Helpers;
// this is just too expensive to do when window is not shown
- if (!is_visible()) return;
+ if (!is_mapped()) {
+ return;
+ }
BoxList & loc_children = location_rows.children();
BoxList & range_children = range_rows.children();
@@ -1034,7 +1046,6 @@ LocationUI::refresh_location_list ()
if (_session) {
_session->locations()->apply (*this, &LocationUI::map_locations);
}
-
}
void
@@ -1047,6 +1058,7 @@ LocationUI::set_session(ARDOUR::Session* s)
_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());
+ _clock_group->set_clock_mode (clock_mode_from_session_instant_xml ());
}
loop_edit_row.set_session (s);
@@ -1087,27 +1099,51 @@ LocationUI::session_going_away()
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 ()));
+ return *node;
+}
+
+AudioClock::Mode
+LocationUI::clock_mode_from_session_instant_xml () const
+{
+ XMLNode* node = _session->instant_xml (X_("LocationUI"));
+ if (!node) {
+ return AudioClock::Frames;
+ }
+
+ XMLProperty* p = node->property (X_("clock-mode"));
+ if (!p) {
+ return AudioClock::Frames;
+ }
+
+ return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
+}
+
/*------------------------*/
LocationUIWindow::LocationUIWindow ()
- : ArdourDialog (_("Locations"))
+ : ArdourWindow (_("Locations"))
{
set_wmclass(X_("ardour_locations"), PROGRAM_NAME);
set_name ("LocationWindow");
- get_vbox()->pack_start (_ui);
+ add (_ui);
}
LocationUIWindow::~LocationUIWindow()
{
}
-void
-LocationUIWindow::on_show()
+void
+LocationUIWindow::on_map ()
{
+ ArdourWindow::on_map ();
_ui.refresh_location_list();
- ArdourDialog::on_show();
}
bool
@@ -1120,13 +1156,13 @@ LocationUIWindow::on_delete_event (GdkEventAny*)
void
LocationUIWindow::set_session (Session *s)
{
- ArdourDialog::set_session (s);
+ ArdourWindow::set_session (s);
_ui.set_session (s);
}
void
LocationUIWindow::session_going_away ()
{
- ArdourDialog::session_going_away ();
+ ArdourWindow::session_going_away ();
hide_all();
}