*/
#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
#include "ardour/session.h"
#include "ardour/audioregion.h"
_region_view (rv),
name_label (_("Name:")),
audition_button (_("Play")),
- time_table (6, 2),
+ _table (8, 2),
position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true, false),
end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true, false),
length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, false, true),
sync_offset_absolute_clock.set_session (_session);
start_clock.set_session (_session);
- name_entry.set_name ("AudioRegionEditorEntry");
- name_label.set_name ("AudioRegionEditorLabel");
-
- name_hbox.set_spacing (5);
- name_hbox.pack_start (name_label, false, false);
- name_hbox.pack_start (name_entry, false, false);
-
ARDOUR_UI::instance()->set_tip (audition_button, _("audition this region"));
audition_button.unset_flags (Gtk::CAN_FOCUS);
audition_button.set_events (audition_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
- top_row_button_hbox.set_border_width (5);
- top_row_button_hbox.set_spacing (5);
- top_row_button_hbox.set_homogeneous (false);
- top_row_button_hbox.pack_end (audition_button, false, false);
-
- top_row_hbox.pack_start (name_hbox, true, true);
- top_row_hbox.pack_end (top_row_button_hbox, true, true);
-
+ name_entry.set_name ("AudioRegionEditorEntry");
+ name_label.set_name ("AudioRegionEditorLabel");
position_label.set_name ("AudioRegionEditorLabel");
- position_label.set_text (_("Position"));
+ position_label.set_text (_("Position:"));
end_label.set_name ("AudioRegionEditorLabel");
- end_label.set_text (_("End"));
+ end_label.set_text (_("End:"));
length_label.set_name ("AudioRegionEditorLabel");
- length_label.set_text (_("Length"));
+ length_label.set_text (_("Length:"));
sync_relative_label.set_name ("AudioRegionEditorLabel");
- sync_relative_label.set_text (_("Sync point (relative to region position)"));
+ sync_relative_label.set_text (_("Sync point (relative to region):"));
sync_absolute_label.set_name ("AudioRegionEditorLabel");
- sync_absolute_label.set_text (_("Sync point (absolute)"));
+ sync_absolute_label.set_text (_("Sync point (absolute):"));
start_label.set_name ("AudioRegionEditorLabel");
- start_label.set_text (_("File start"));
+ start_label.set_text (_("File start:"));
- time_table.set_col_spacings (2);
- time_table.set_row_spacings (5);
- time_table.set_border_width (5);
+ _table.set_col_spacings (12);
+ _table.set_row_spacings (6);
+ _table.set_border_width (12);
+ name_label.set_alignment (1, 0.5);
position_label.set_alignment (1, 0.5);
- time_table.attach (position_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
- time_table.attach (position_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
+ end_label.set_alignment (1, 0.5);
+ length_label.set_alignment (1, 0.5);
+ sync_relative_label.set_alignment (1, 0.5);
+ sync_absolute_label.set_alignment (1, 0.5);
+ start_label.set_alignment (1, 0.5);
+ gain_label.set_alignment (1, 0.5);
+
+ Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
+ nb->set_spacing (6);
+ nb->pack_start (name_entry);
+ nb->pack_start (audition_button);
+
+ _table.attach (name_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (*nb, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
- end_label.set_alignment (1, 0.5);
- time_table.attach (end_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
- time_table.attach (end_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
+ _table.attach (position_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+ _table.attach (position_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
+
+ _table.attach (end_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
+ _table.attach (end_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
- length_label.set_alignment (1, 0.5);
- time_table.attach (length_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
- time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
+ _table.attach (length_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL);
+ _table.attach (length_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL);
- sync_relative_label.set_alignment (1, 0.5);
- time_table.attach (sync_relative_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL);
- time_table.attach (sync_offset_relative_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_relative_label, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_relative_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL);
- sync_absolute_label.set_alignment (1, 0.5);
- time_table.attach (sync_absolute_label, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL);
- time_table.attach (sync_offset_absolute_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_absolute_label, 0, 1, 5, 6, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_absolute_clock, 1, 2, 5, 6, Gtk::FILL, Gtk::FILL);
+
+ _table.attach (start_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL);
+ _table.attach (start_clock, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL);
- start_label.set_alignment (1, 0.5);
- time_table.attach (start_label, 0, 1, 5, 6, Gtk::FILL, Gtk::FILL);
- time_table.attach (start_clock, 1, 2, 5, 6, Gtk::FILL, Gtk::FILL);
+ Gtk::HBox* gb = Gtk::manage (new Gtk::HBox);
+ gb->set_spacing (6);
+ gb->pack_start (gain_entry);
+ gb->pack_start (*Gtk::manage (new Gtk::Label (_("dB"))), false, false);
gain_label.set_name ("AudioRegionEditorLabel");
- gain_label.set_text (_("Scale amplitude:"));
- gain_label.set_alignment (1, 0.5);
+ gain_label.set_text (_("Region gain:"));
gain_entry.configure (gain_adjustment, 0.0, 1);
- time_table.attach (gain_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL);
- time_table.attach (gain_entry, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL);
+ _table.attach (gain_label, 0, 1, 7, 8, Gtk::FILL, Gtk::FILL);
+ _table.attach (*gb, 1, 2, 7, 8, Gtk::FILL, Gtk::FILL);
- lower_hbox.pack_start (time_table, true, true);
- lower_hbox.pack_start (sep1, false, false);
- lower_hbox.pack_start (sep2, false, false);
+ get_vbox()->pack_start (_table, true, true);
- get_vbox()->pack_start (top_row_hbox, true, true);
- get_vbox()->pack_start (sep3, false, false);
- get_vbox()->pack_start (lower_hbox, true, true);
+ add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
set_name ("AudioRegionEditorWindow");
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, &AudioRegionEditor::handle_response));
- set_title (string_compose (_("Region %1"), _region->name()));
+ set_title (string_compose (_("Region '%1'"), _region->name()));
show_all();
name_changed ();
- bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|Region::SyncOffsetChanged));
+
+ PropertyChange change;
+
+ change.add (ARDOUR::Properties::start);
+ change.add (ARDOUR::Properties::length);
+ change.add (ARDOUR::Properties::position);
+ change.add (ARDOUR::Properties::sync_position);
+
+ bounds_changed (change);
+
gain_changed ();
- _region->StateChanged.connect (state_connection, ui_bind (&AudioRegionEditor::region_changed, this, _1), gui_context());
+ _region->PropertyChanged.connect (state_connection, invalidator (*this), ui_bind (&AudioRegionEditor::region_changed, this, _1), gui_context());
spin_arrow_grab = false;
}
void
-AudioRegionEditor::region_changed (PBD::Change what_changed)
+AudioRegionEditor::region_changed (const PBD::PropertyChange& what_changed)
{
- if (what_changed & NameChanged) {
+ if (what_changed.contains (ARDOUR::Properties::name)) {
name_changed ();
}
- if (what_changed & Change (BoundsChanged|StartChanged|Region::SyncOffsetChanged)) {
+ PropertyChange interesting_stuff;
+
+ interesting_stuff.add (ARDOUR::Properties::position);
+ interesting_stuff.add (ARDOUR::Properties::length);
+ interesting_stuff.add (ARDOUR::Properties::start);
+ interesting_stuff.add (ARDOUR::Properties::sync_position);
+
+ if (what_changed.contains (interesting_stuff)) {
bounds_changed (what_changed);
}
- if (what_changed & AudioRegion::ScaleAmplitudeChanged) {
+ if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) {
gain_changed ();
}
}
audition_button.signal_toggled().connect (sigc::mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
- _session->AuditionActive.connect (audition_connection, ui_bind (&AudioRegionEditor::audition_state_changed, this, _1), gui_context());
+ _session->AuditionActive.connect (audition_connection, invalidator (*this), ui_bind (&AudioRegionEditor::audition_state_changed, this, _1), gui_context());
}
void
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
- XMLNode &before = pl->get_state();
+ _region->clear_history ();
_region->set_position (position_clock.current_time(), this);
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
+ _session->add_command(new StatefulDiffCommand (_region));
}
_session->commit_reversible_command ();
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
- XMLNode &before = pl->get_state();
+ _region->clear_history ();
_region->trim_end (end_clock.current_time(), this);
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
+ _session->add_command(new StatefulDiffCommand (_region));
}
_session->commit_reversible_command ();
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
- XMLNode &before = pl->get_state();
+ _region->clear_history ();
_region->trim_end (_region->position() + frames - 1, this);
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
+ _session->add_command(new StatefulDiffCommand (_region));
}
_session->commit_reversible_command ();
}
void
-AudioRegionEditor::bounds_changed (Change what_changed)
+AudioRegionEditor::bounds_changed (const PropertyChange& what_changed)
{
- if ((what_changed & Change (PositionChanged|LengthChanged)) == Change (PositionChanged|LengthChanged)) {
+ if (what_changed.contains (ARDOUR::Properties::position) && what_changed.contains (ARDOUR::Properties::length)) {
position_clock.set (_region->position(), true);
end_clock.set (_region->position() + _region->length() - 1, true);
length_clock.set (_region->length(), true);
- } else if (what_changed & Change (PositionChanged)) {
+ } else if (what_changed.contains (ARDOUR::Properties::position)) {
position_clock.set (_region->position(), true);
end_clock.set (_region->position() + _region->length() - 1, true);
- } else if (what_changed & Change (LengthChanged)) {
+ } else if (what_changed.contains (ARDOUR::Properties::length)) {
end_clock.set (_region->position() + _region->length() - 1, true);
length_clock.set (_region->length(), true);
}
- if ((what_changed & Region::SyncOffsetChanged) || (what_changed & PositionChanged)) {
+ if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
int dir;
nframes_t off = _region->sync_offset (dir);
if (dir == -1) {
off = -off;
}
- if (what_changed & Region::SyncOffsetChanged) {
+ if (what_changed.contains (ARDOUR::Properties::sync_position)) {
sync_offset_relative_clock.set (off, true);
}
sync_offset_absolute_clock.set (off + _region->position (), true);
}
- if (what_changed & StartChanged) {
+ if (what_changed.contains (ARDOUR::Properties::start)) {
start_clock.set (_region->start(), true);
}
}
{
_session->begin_reversible_command (_("change region sync point"));
- XMLNode& before = _region->get_state ();
+ _region->clear_history ();
_region->set_sync_position (sync_offset_absolute_clock.current_time());
- XMLNode& after = _region->get_state ();
- _session->add_command (new MementoCommand<AudioRegion> (*_region.get(), &before, &after));
+ _session->add_command (new StatefulDiffCommand (_region));
_session->commit_reversible_command ();
}
{
_session->begin_reversible_command (_("change region sync point"));
- XMLNode& before = _region->get_state ();
+ _region->clear_history ();
_region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
- XMLNode& after = _region->get_state ();
- _session->add_command (new MementoCommand<AudioRegion> (*_region.get(), &before, &after));
+ _session->add_command (new StatefulDiffCommand (_region));
_session->commit_reversible_command ();
}
bool
AudioRegionEditor::on_delete_event (GdkEventAny* ev)
{
- bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|Region::SyncOffsetChanged));
+ PropertyChange change;
+
+ change.add (ARDOUR::Properties::start);
+ change.add (ARDOUR::Properties::length);
+ change.add (ARDOUR::Properties::position);
+ change.add (ARDOUR::Properties::sync_position);
+
+ bounds_changed (change);
+
return RegionEditor::on_delete_event (ev);
}
+
+void
+AudioRegionEditor::handle_response (int)
+{
+ hide ();
+}
projects / ardour.git / blobdiff