/*
- 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
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/window_title.h>
-#include <ardour/utils.h>
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <pbd/memento_command.h>
+#include "ardour/utils.h"
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
#include "ardour_ui.h"
#include "prompter.h"
#include "i18n.h"
+using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
: location(0), session(0),
item_table (1, 7, false),
- start_set_button (_("Set")),
+ start_set_button (_("Use PH")),
start_go_button (_("Go")),
start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true),
- end_set_button (_("Set")),
+ end_set_button (_("Use PH")),
end_go_button (_("Go")),
end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true),
length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, true),
preemph_check_button (_("Pre-Emphasis"))
{
-
+
i_am_the_modifier = 0;
number_label.set_name ("LocationEditNumberLabel");
composer_label.set_name ("LocationEditNumberLabel");
composer_entry.set_name ("LocationEditNameEntry");
+ ARDOUR_UI::instance()->tooltips().set_tip(start_set_button, _("Set value to Playhead"));
+ ARDOUR_UI::instance()->tooltips().set_tip(end_set_button, _("Set value to Playhead"));
isrc_label.set_text ("ISRC: ");
isrc_label.set_size_request (30, -1);
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));
+ 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));
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_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);
-
+
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));
+ start_clock.ChangeAborted.connect (bind (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));
-
+ end_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), 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));
+ length_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), 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));
pack_start(item_table, true, true);
start_clock.set_session (session);
end_clock.set_session (session);
- length_clock.set_session (session);
-
+ length_clock.set_session (session);
+
}
void
item_table.attach (hide_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0);
}
hide_check_button.set_active (location->is_hidden());
-
+
if (location->is_auto_loop() || location-> is_auto_punch()) {
// use label instead of entry
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, 1, 2, 0, 1, FILL, FILL, 4, 0);
}
-
+
name_label.show();
} else {
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 (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);
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, 5, 6, 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, 7, 8, 0, 1, FILL, FILL, 4, 0);
}
- /* XXX i can't find a way to hide the button without messing up
+ /* XXX i can't find a way to hide the button without messing up
the row spacing, so make it insensitive (paul).
*/
}
start_clock.set (location->start(), true);
-
+
if (!location->is_mark()) {
if (!end_hbox.get_parent()) {
LocationEditRow::isrc_entry_changed ()
{
ENSURE_GUI_THREAD(mem_fun(*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");
}
LocationEditRow::performer_entry_changed ()
{
ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::performer_entry_changed));
-
+
if (i_am_the_modifier || !location) return;
if (performer_entry.get_text() != "") {
LocationEditRow::composer_entry_changed ()
{
ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::composer_entry_changed));
-
+
if (i_am_the_modifier || !location) return;
if (composer_entry.get_text() != "") {
LocationEditRow::set_button_pressed (LocationPart part)
{
if (!location) return;
-
+
switch (part) {
case LocStart:
location->set_start (session->transport_frame ());
LocationEditRow::clock_changed (LocationPart part)
{
if (i_am_the_modifier || !location) return;
-
+
switch (part) {
case LocStart:
location->set_start (start_clock.current_time());
}
+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() == location->is_cd_marker()) {
+ // return;
+ //}
if (cd_check_button.get_active()) {
if (location->start() <= session->current_start_frame()) {
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();
-
+
} else if (cd_track_details_hbox.get_parent()){
-
- item_table.remove (cd_track_details_hbox);
+
+ item_table.remove (cd_track_details_hbox);
// item_table.resize(1, 7);
redraw_ranges(); /* EMIT_SIGNAL */
}
} else {
location->cd_info.erase("scms");
}
-
+
}
void
ENSURE_GUI_THREAD(bind (mem_fun(*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--;
}
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::start_changed), loc));
if (!location) return;
-
+
// update end and length
i_am_the_modifier++;
} else {
cd_check_button.set_sensitive (true);
}
-
+
i_am_the_modifier--;
}
LocationEditRow::name_changed (ARDOUR::Location *loc)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::name_changed), loc));
-
+
if (!location) return;
// update end and length
void
LocationEditRow::location_changed (ARDOUR::Location *loc)
-{
+{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::location_changed), loc));
-
+
if (!location) return;
i_am_the_modifier++;
LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::flags_changed), loc, src));
-
+
if (!location) return;
i_am_the_modifier++;
i_am_the_modifier--;
}
+void
+LocationEditRow::focus_name() {
+ name_entry.grab_focus();
+}
+
+
LocationUI::LocationUI ()
- : ArdourDialog ("locations dialog"),
- add_location_button (_("Add New Location")),
- add_range_button (_("Add New Range"))
+ : session (0)
+ , add_location_button (_("Add New Location"))
+ , add_range_button (_("Add New Range"))
{
i_am_the_modifier = 0;
-
- WindowTitle title(Glib::get_application_name());
- title += _("Locations");
- set_title(title.get_string());
- set_wmclass(X_("ardour_locations"), "Ardour");
-
- set_name ("LocationWindow");
-
- get_vbox()->pack_start (location_hpacker);
-
- location_vpacker.set_border_width (10);
location_vpacker.set_spacing (5);
-
+
location_vpacker.pack_start (loop_edit_row, false, false);
location_vpacker.pack_start (punch_edit_row, false, false);
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);
loc_frame.set_name ("LocationLocEditorFrame");
- loc_frame.set_label (_("Location (CD Index) Markers"));
+ loc_frame.set_label (_("Location (CD index) markers"));
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 (add_range_button, false, false);
range_frame.set_name ("LocationRangeEditorFrame");
- range_frame.set_label (_("Range (CD Track) Markers"));
+ range_frame.set_label (_("Range (CD track) markers"));
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);
+
+ pack_start (location_vpacker, true, true);
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);
-
-
+ show_all ();
}
LocationUI::~LocationUI()
{
}
-void LocationUI::on_show()
-{
- ArdourDialog::on_show();
- refresh_location_list();
-}
-
-
-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
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 (bind (mem_fun(*this, &LocationUI::do_location_remove), loc));
}
-void LocationUI::location_redraw_ranges ()
+void
+LocationUI::location_redraw_ranges ()
{
-
range_rows.hide();
range_rows.show();
-
}
-
void
LocationUI::location_added (Location* location)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_added), location));
-
+
if (location->is_auto_punch()) {
punch_edit_row.set_location(location);
}
LocationUI::location_removed (Location* location)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_removed), location));
-
+
if (location->is_auto_punch()) {
punch_edit_row.set_location(0);
}
{
Locations::LocationList::iterator i;
Location* location;
- gint n;
+ gint n;
int mark_n = 0;
Locations::LocationList temp = locations;
LocationSortByStart cmp;
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;
erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
erow->redraw_ranges.connect (mem_fun(*this, &LocationUI::location_redraw_ranges));
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);
+ punch_edit_row.show_all();
}
else if (location->is_auto_loop()) {
loop_edit_row.set_session (session);
loop_edit_row.set_location (location);
+ loop_edit_row.show_all();
}
else {
erow = manage (new LocationEditRow(session, location));
nframes_t where = session->audible_frame();
session->locations()->next_available_name(markername,"mark");
Location *location = new Location (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);
session->add_command (new MementoCommand<Locations>(*(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 ();
}
loc_children.clear();
range_children.clear();
+ cerr << "about to map locations with session = " << session << endl;
+
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);
+ session = s;
if (session) {
session->locations()->changed.connect (mem_fun(*this, &LocationUI::refresh_location_list));
LocationUI::session_gone()
{
ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::session_gone));
-
- hide_all();
using namespace Box_Helpers;
BoxList & loc_children = location_rows.children();
punch_edit_row.set_session (0);
punch_edit_row.set_location (0);
+}
- ArdourDialog::session_gone ();
+/*------------------------*/
+
+LocationUIWindow::LocationUIWindow ()
+ : ArdourDialog ("locations dialog")
+{
+ set_title (_("Locations"));
+ set_wmclass(X_("ardour_locations"), "Ardour");
+ set_name ("LocationWindow");
+
+ get_vbox()->pack_start (_ui);
+}
+
+LocationUIWindow::~LocationUIWindow()
+{
+}
+
+void
+LocationUIWindow::on_show()
+{
+ cerr << "Show loc list\n";
+ _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)
+{
+ cerr << "Setting session in LUW, with s = " << s << "\n";
+
+ ArdourDialog::set_session (s);
+ _ui.set_session (s);
+
+ s->GoingAway.connect (mem_fun (*this, &LocationUIWindow::session_gone));
+}
+
+void
+LocationUIWindow::session_gone ()
+{
+ hide_all();
+ ArdourDialog::session_gone ();
+}