X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.cc;h=fe91100d7a4377be7a6762a987cc212112ca984b;hb=7f1784252882cd216a9912f57f66533cc06af8a5;hp=aadbbfc5b7c6445da65e7077d58196c86de67091;hpb=b85b4d9e54caef0585d308ef3bffee21d0e5ae56;p=ardour.git
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index aadbbfc5b7..fe91100d7a 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -28,11 +28,12 @@
#include "pbd/memento_command.h"
#include "ardour_ui.h"
-#include "prompter.h"
-#include "location_ui.h"
+#include "clock_group.h"
+#include "gui_thread.h"
#include "keyboard.h"
+#include "location_ui.h"
+#include "prompter.h"
#include "utils.h"
-#include "gui_thread.h"
#include "i18n.h"
@@ -43,120 +44,149 @@ 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, 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 (_("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_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");
- 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 ("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_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);
-
- 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);
-
- 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.pack_start (start_go_button, false, false);
- start_hbox.pack_start (start_clock, 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);
-
- 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_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);
-
- set_location (loc);
- set_number (num);
-}
+ : SessionHandlePtr (0) /* explicitly set below */
+ , location(0)
+ , item_table (1, 6, false)
+ , start_clock (X_("locationstart"), true, "", true, false)
+ , end_clock (X_("locationend"), true, "", true, false)
+ , 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)));
+
+ 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");
+ 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");
+
+ 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_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);
+
+ 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);
+
+ 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.pack_start (start_go_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 (start_hbox, 1, 2, 0, 1, FILL, FILL, 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));
+
+ end_hbox.pack_start (end_go_button, false, false);
+ 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));
+
+ 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);
+ }
-LocationEditRow::~LocationEditRow()
-{
- if (location) {
- connections.drop_connections ();
- }
+ _clock_group = &cg;
+
+ _clock_group->add (start_clock);
+ _clock_group->add (end_clock);
+ _clock_group->add (length_clock);
}
void
@@ -164,14 +194,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
@@ -310,7 +339,7 @@ void
LocationEditRow::name_entry_changed ()
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed)
-
+
if (i_am_the_modifier || !location) {
return;
}
@@ -383,6 +412,25 @@ LocationEditRow::go_button_pressed (LocationPart part)
}
}
+void
+LocationEditRow::to_playhead_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::clock_changed (LocationPart part)
{
@@ -404,14 +452,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 ()
{
@@ -541,7 +581,7 @@ LocationEditRow::preemph_toggled ()
}
void
-LocationEditRow::end_changed (ARDOUR::Location *loc)
+LocationEditRow::end_changed (ARDOUR::Location *)
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc)
@@ -659,6 +699,15 @@ LocationEditRow::focus_name() {
name_entry.grab_focus();
}
+void
+LocationEditRow::set_clock_sensitivity ()
+{
+ start_clock.set_sensitive (!location->locked());
+ end_clock.set_sensitive (!location->locked());
+ length_clock.set_sensitive (!location->locked());
+}
+
+/*------------------------------------------------------------------------*/
LocationUI::LocationUI ()
: add_location_button (_("New Marker"))
@@ -666,6 +715,8 @@ LocationUI::LocationUI ()
{
i_am_the_modifier = 0;
+ _clock_group = new ClockGroup;
+
VBox* vbox = manage (new VBox);
Table* table = manage (new Table (2, 2));
@@ -679,14 +730,17 @@ 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_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_col_spacing (0, 32);
@@ -694,7 +748,7 @@ LocationUI::LocationUI ()
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);
@@ -729,7 +783,7 @@ LocationUI::LocationUI ()
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);
@@ -765,15 +819,16 @@ 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 ();
}
LocationUI::~LocationUI()
{
+ delete _clock_group;
}
-gint
+gint
LocationUI::do_location_remove (ARDOUR::Location *loc)
{
/* this is handled internally by Locations, but there's
@@ -795,7 +850,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
@@ -805,7 +860,7 @@ LocationUI::location_remove_requested (ARDOUR::Location *loc)
}
-void
+void
LocationUI::location_redraw_ranges ()
{
range_rows.hide();
@@ -830,7 +885,10 @@ 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));
+
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 */
@@ -850,7 +908,7 @@ LocationUI::location_added (Location* location)
}
++i;
-
+
if (j != children.end()) {
++j;
}
@@ -900,9 +958,12 @@ 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->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));
if (location == newest_location) {
newest_location = 0;
@@ -918,7 +979,10 @@ LocationUI::map_locations (Locations::LocationList& locations)
loop_edit_row.show_all();
} else {
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));
+
Box_Helpers::BoxList & range_children = range_rows.children();
range_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
}
@@ -934,7 +998,7 @@ LocationUI::add_new_location()
string markername;
if (_session) {
- nframes_t where = _session->audible_frame();
+ 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()) {
@@ -956,7 +1020,7 @@ LocationUI::add_new_range()
string rangename;
if (_session) {
- nframes_t where = _session->audible_frame();
+ 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"));
@@ -975,7 +1039,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();
@@ -986,7 +1052,6 @@ LocationUI::refresh_location_list ()
if (_session) {
_session->locations()->apply (*this, &LocationUI::map_locations);
}
-
}
void
@@ -999,6 +1064,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);
@@ -1039,34 +1105,51 @@ LocationUI::session_going_away()
SessionHandlePtr::session_going_away ();
}
-void
-LocationEditRow::set_clock_sensitivity ()
+XMLNode &
+LocationUI::get_state () const
{
- start_clock.set_sensitive (!location->locked());
- end_clock.set_sensitive (!location->locked());
- length_clock.set_sensitive (!location->locked());
+ 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
@@ -1079,13 +1162,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();
}