*/
+#include <cmath>
+
+#include <gtkmm/listviewtext.h>
+
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
-#include "ardour/session.h"
#include "ardour/region.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/dB.h"
+#include "ardour/session.h"
#include "ardour/source.h"
-#include "gtkmm2ext/utils.h"
-#include <gtkmm/listviewtext.h>
-#include <cmath>
-#include "region_editor.h"
#include "ardour_ui.h"
-#include "utils.h"
+#include "clock_group.h"
+#include "main_clock.h"
#include "gui_thread.h"
+#include "region_editor.h"
+#include "public_editor.h"
+#include "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace PBD;
using namespace std;
using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
- : ArdourDialog (_("Region")),
- _table (9, 2),
- _table_row (0),
- _region (r),
- name_label (_("Name:")),
- audition_button (_("Play")),
- position_clock (X_("regionposition"), true, X_("RegionEditorClock"), true, false),
- end_clock (X_("regionend"), true, X_("RegionEditorClock"), true, false),
- length_clock (X_("regionlength"), true, X_("RegionEditorClock"), true, false, true),
- sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("RegionEditorClock"), true, false),
- sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("RegionEditorClock"), true, false),
- /* XXX cannot file start yet */
- start_clock (X_("regionstart"), true, X_("RegionEditorClock"), false, false),
- _sources (1)
+ : ArdourDialog (_("Region"))
+ , _table (9, 2)
+ , _table_row (0)
+ , _region (r)
+ , name_label (_("Name:"))
+ , audition_button (_("Audition"))
+ , _clock_group (new ClockGroup)
+ , position_clock (X_("regionposition"), true, "", true, false)
+ , end_clock (X_("regionend"), true, "", true, false)
+ , length_clock (X_("regionlength"), true, "", true, false, true)
+ , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
+ , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
+ /* XXX cannot file start yet */
+ , start_clock (X_("regionstart"), true, "", false, false)
+ , _sources (1)
{
set_session (s);
-
+
+ _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
+ _clock_group->add (position_clock);
+ _clock_group->add (end_clock);
+ _clock_group->add (length_clock);
+ _clock_group->add (sync_offset_relative_clock);
+ _clock_group->add (sync_offset_absolute_clock);
+ _clock_group->add (start_clock);
+
position_clock.set_session (_session);
end_clock.set_session (_session);
length_clock.set_session (_session);
sync_offset_absolute_clock.set_session (_session);
start_clock.set_session (_session);
- ARDOUR_UI::instance()->set_tip (audition_button, _("audition this region"));
+ set_tooltip (audition_button, _("audition this region"));
audition_button.unset_flags (Gtk::CAN_FOCUS);
Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
nb->set_spacing (6);
nb->pack_start (name_entry);
- nb->pack_start (audition_button);
+ nb->pack_start (audition_button, false, false);
_table.attach (name_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
_table.attach (position_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
_table.attach (end_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
-
+
_table.attach (length_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
-
+
_table.attach (sync_relative_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
-
+
_table.attach (sync_absolute_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
_table.attach (start_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
_table.attach (_sources_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
++_table_row;
-
+
get_vbox()->pack_start (_table, true, true);
add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
set_name ("RegionEditorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
signal_response().connect (sigc::mem_fun (*this, &RegionEditor::handle_response));
set_title (string_compose (_("Region '%1'"), _region->name()));
bounds_changed (change);
- _region->PropertyChanged.connect (state_connection, invalidator (*this), ui_bind (&RegionEditor::region_changed, this, _1), gui_context());
+ _region->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&RegionEditor::region_changed, this, _1), gui_context());
spin_arrow_grab = false;
connect_editor_events ();
}
+RegionEditor::~RegionEditor ()
+{
+ delete _clock_group;
+}
+
void
RegionEditor::region_changed (const PBD::PropertyChange& what_changed)
{
audition_button.signal_toggled().connect (sigc::mem_fun(*this, &RegionEditor::audition_button_toggled));
- _session->AuditionActive.connect (audition_connection, invalidator (*this), ui_bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
+ _session->AuditionActive.connect (audition_connection, invalidator (*this), boost::bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
}
void
RegionEditor::position_clock_changed ()
{
- _session->begin_reversible_command (_("change region start position"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
+ PublicEditor::instance().begin_reversible_command (_("change region start position"));
+ in_command = true;
+
_region->clear_changes ();
- _region->set_position (position_clock.current_time(), this);
+ _region->set_position (position_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
}
void
RegionEditor::end_clock_changed ()
{
- _session->begin_reversible_command (_("change region end position"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
+ PublicEditor::instance().begin_reversible_command (_("change region end position"));
+ in_command = true;
+
_region->clear_changes ();
- _region->trim_end (end_clock.current_time(), this);
+ _region->trim_end (end_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
end_clock.set (_region->position() + _region->length() - 1, true);
}
RegionEditor::length_clock_changed ()
{
framecnt_t frames = length_clock.current_time();
-
- _session->begin_reversible_command (_("change region length"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
- _region->clear_changes ();
- _region->trim_end (_region->position() + frames - 1, this);
+ PublicEditor::instance().begin_reversible_command (_("change region length"));
+ in_command = true;
+
+ _region->clear_changes ();
+ _region->trim_end (_region->position() + frames - 1);
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
length_clock.set (_region->length());
}
void
RegionEditor::sync_offset_absolute_clock_changed ()
{
- _session->begin_reversible_command (_("change region sync point"));
+ PublicEditor::instance().begin_reversible_command (_("change region sync point"));
_region->clear_changes ();
_region->set_sync_position (sync_offset_absolute_clock.current_time());
_session->add_command (new StatefulDiffCommand (_region));
-
- _session->commit_reversible_command ();
+
+ PublicEditor::instance().commit_reversible_command ();
}
void
RegionEditor::sync_offset_relative_clock_changed ()
{
- _session->begin_reversible_command (_("change region sync point"));
+ PublicEditor::instance().begin_reversible_command (_("change region sync point"));
_region->clear_changes ();
_region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
_session->add_command (new StatefulDiffCommand (_region));
-
- _session->commit_reversible_command ();
+
+ PublicEditor::instance().commit_reversible_command ();
}
bool
projects / ardour.git / blobdiff