smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

Tidy up the popup region editor and fix a few bugs with it; should close mantis 2601 and 2602.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5813 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-10-20 01:05:33 +00:00
parent 089d75e8a8
commit 9155aca8c2
5 changed files with 96 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

112
gtk2_ardour/audio_region_editor.cc
View file

@ -44,21 +44,23 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
: RegionEditor (s), : RegionEditor (s),
_region (r), _region (r),
_region_view (rv), _region_view (rv),
name_label (_("NAME:")), name_label (_("Name:")),
audition_button (_("play")), audition_button (_("Play")),
time_table (5, 2), time_table (6, 2),
position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true), position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true),
end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true), end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true),
length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true), length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true),
/* XXX cannot edit sync point or start yet */ sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("AudioRegionEditorClock"), true),
sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), false), sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("AudioRegionEditorClock"), true),
/* XXX cannot file start yet */
start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false) start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false)
{ {
position_clock.set_session (&_session); position_clock.set_session (&_session);
end_clock.set_session (&_session); end_clock.set_session (&_session);
length_clock.set_session (&_session); length_clock.set_session (&_session);
sync_offset_clock.set_session (&_session); sync_offset_relative_clock.set_session (&_session);
sync_offset_absolute_clock.set_session (&_session);
start_clock.set_session (&_session); start_clock.set_session (&_session);
name_entry.set_name ("AudioRegionEditorEntry"); name_entry.set_name ("AudioRegionEditorEntry");
@ -83,46 +85,45 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
top_row_hbox.pack_end (top_row_button_hbox, true, true); top_row_hbox.pack_end (top_row_button_hbox, true, true);
position_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_name ("AudioRegionEditorLabel");
end_label.set_text (_("END:")); end_label.set_text (_("End"));
length_label.set_name ("AudioRegionEditorLabel"); length_label.set_name ("AudioRegionEditorLabel");
length_label.set_text (_("LENGTH:")); length_label.set_text (_("Length"));
sync_label.set_name ("AudioRegionEditorLabel"); sync_relative_label.set_name ("AudioRegionEditorLabel");
sync_label.set_text (_("SYNC POINT:")); sync_relative_label.set_text (_("Sync point (relative to region position)"));
sync_absolute_label.set_name ("AudioRegionEditorLabel");
sync_absolute_label.set_text (_("Sync point (absolute)"));
start_label.set_name ("AudioRegionEditorLabel"); 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_col_spacings (2);
time_table.set_row_spacings (5); time_table.set_row_spacings (5);
time_table.set_border_width (5); time_table.set_border_width (5);
position_alignment.set (1.0, 0.5); position_label.set_alignment (1, 0.5);
end_alignment.set (1.0, 0.5); time_table.attach (position_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
length_alignment.set (1.0, 0.5);
sync_alignment.set (1.0, 0.5);
start_alignment.set (1.0, 0.5);
position_alignment.add (position_label);
end_alignment.add (end_label);
length_alignment.add (length_label);
sync_alignment.add (sync_label);
start_alignment.add (start_label);
time_table.attach (position_alignment, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
time_table.attach (position_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); time_table.attach (position_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
time_table.attach (end_alignment, 0, 1, 1, 2, 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); time_table.attach (end_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
time_table.attach (length_alignment, 0, 1, 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); time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
time_table.attach (sync_alignment, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL); sync_relative_label.set_alignment (1, 0.5);
time_table.attach (sync_offset_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL); 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);
time_table.attach (start_alignment, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL); sync_absolute_label.set_alignment (1, 0.5);
time_table.attach (start_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL); 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);
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);
lower_hbox.pack_start (time_table, true, true); lower_hbox.pack_start (time_table, true, true);
lower_hbox.pack_start (sep1, false, false); lower_hbox.pack_start (sep1, false, false);
@ -208,6 +209,8 @@ AudioRegionEditor::connect_editor_events ()
position_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::position_clock_changed)); position_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::position_clock_changed));
end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed)); end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed)); length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed));
sync_offset_absolute_clock.ValueChanged.connect (mem_fun (*this, &AudioRegionEditor::sync_offset_absolute_clock_changed));
sync_offset_relative_clock.ValueChanged.connect (mem_fun (*this, &AudioRegionEditor::sync_offset_relative_clock_changed));
audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled)); audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
_session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed)); _session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed));
@ -246,7 +249,7 @@ AudioRegionEditor::end_clock_changed ()
_session.commit_reversible_command (); _session.commit_reversible_command ();
end_clock.set (_region->position() + _region->length(), true); end_clock.set (_region->position() + _region->length() - 1, true);
} }
void void
@ -260,7 +263,7 @@ AudioRegionEditor::length_clock_changed ()
if (pl) { if (pl) {
XMLNode &before = pl->get_state(); XMLNode &before = pl->get_state();
_region->trim_end (_region->position() + frames, this); _region->trim_end (_region->position() + frames - 1, this);
XMLNode &after = pl->get_state(); XMLNode &after = pl->get_state();
_session.add_command(new MementoCommand<Playlist>(*pl, &before, &after)); _session.add_command(new MementoCommand<Playlist>(*pl, &before, &after));
} }
@ -293,18 +296,28 @@ AudioRegionEditor::bounds_changed (Change what_changed)
{ {
if ((what_changed & Change (PositionChanged|LengthChanged)) == Change (PositionChanged|LengthChanged)) { if ((what_changed & Change (PositionChanged|LengthChanged)) == Change (PositionChanged|LengthChanged)) {
position_clock.set (_region->position(), true); position_clock.set (_region->position(), true);
end_clock.set (_region->position() + _region->length(), true); end_clock.set (_region->position() + _region->length() - 1, true);
length_clock.set (_region->length(), true); length_clock.set (_region->length(), true);
} else if (what_changed & Change (PositionChanged)) { } else if (what_changed & Change (PositionChanged)) {
position_clock.set (_region->position(), true); position_clock.set (_region->position(), true);
end_clock.set (_region->position() + _region->length(), true); end_clock.set (_region->position() + _region->length() - 1, true);
} else if (what_changed & Change (LengthChanged)) { } else if (what_changed & Change (LengthChanged)) {
end_clock.set (_region->position() + _region->length(), true); end_clock.set (_region->position() + _region->length() - 1, true);
length_clock.set (_region->length(), true); length_clock.set (_region->length(), true);
} }
if ((what_changed & Region::SyncOffsetChanged) || (what_changed & PositionChanged)) {
int dir;
nframes_t off = _region->sync_offset (dir);
if (dir == -1) {
off = -off;
}
if (what_changed & Region::SyncOffsetChanged) { if (what_changed & Region::SyncOffsetChanged) {
sync_offset_clock.set (_region->sync_position(), true); sync_offset_relative_clock.set (off, true);
}
sync_offset_absolute_clock.set (off + _region->position (), true);
} }
if (what_changed & StartChanged) { if (what_changed & StartChanged) {
@ -336,3 +349,28 @@ AudioRegionEditor::audition_state_changed (bool yn)
} }
} }
void
AudioRegionEditor::sync_offset_absolute_clock_changed ()
{
_session.begin_reversible_command (_("change region sync point"));
XMLNode& before = _region->get_state ();
_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.commit_reversible_command ();
}
void
AudioRegionEditor::sync_offset_relative_clock_changed ()
{
_session.begin_reversible_command (_("change region sync point"));
XMLNode& before = _region->get_state ();
_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.commit_reversible_command ();
}

14
gtk2_ardour/audio_region_editor.h
View file

@ -30,7 +30,6 @@
#include <gtkmm/arrow.h> #include <gtkmm/arrow.h>
#include <gtkmm/frame.h> #include <gtkmm/frame.h>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/alignment.h>
#include <gtkmm/adjustment.h> #include <gtkmm/adjustment.h>
#include <gtkmm/separator.h> #include <gtkmm/separator.h>
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
@ -77,18 +76,15 @@ class AudioRegionEditor : public RegionEditor
Gtk::Label position_label; Gtk::Label position_label;
Gtk::Label end_label; Gtk::Label end_label;
Gtk::Label length_label; Gtk::Label length_label;
Gtk::Label sync_label; Gtk::Label sync_relative_label;
Gtk::Label sync_absolute_label;
Gtk::Label start_label; Gtk::Label start_label;
Gtk::Alignment position_alignment;
Gtk::Alignment end_alignment;
Gtk::Alignment length_alignment;
Gtk::Alignment sync_alignment;
Gtk::Alignment start_alignment;
AudioClock position_clock; AudioClock position_clock;
AudioClock end_clock; AudioClock end_clock;
AudioClock length_clock; AudioClock length_clock;
AudioClock sync_offset_clock; AudioClock sync_offset_relative_clock; ///< sync offset relative to the start of the region
AudioClock sync_offset_absolute_clock; ///< sync offset relative to the start of the timeline
AudioClock start_clock; AudioClock start_clock;
Gtk::HSeparator sep3; Gtk::HSeparator sep3;
@ -107,6 +103,8 @@ class AudioRegionEditor : public RegionEditor
void position_clock_changed (); void position_clock_changed ();
void end_clock_changed (); void end_clock_changed ();
void length_clock_changed (); void length_clock_changed ();
void sync_offset_absolute_clock_changed ();
void sync_offset_relative_clock_changed ();
void audition_button_toggled (); void audition_button_toggled ();

7
gtk2_ardour/editor.cc
View file

@ -1706,9 +1706,9 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::rename_region))); items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::rename_region)));
if (mr && internal_editing()) { if (mr && internal_editing()) {
items.push_back (MenuElem (_("Popup list editor"), mem_fun(*this, &Editor::show_midi_list_editor))); items.push_back (MenuElem (_("List editor..."), mem_fun(*this, &Editor::show_midi_list_editor)));
} else { } else {
items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region))); items.push_back (MenuElem (_("Region editor"), mem_fun(*this, &Editor::edit_region)));
} }
} }
@ -1716,6 +1716,9 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun (*this, &Editor::lower_region_to_bottom))); items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun (*this, &Editor::lower_region_to_bottom)));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_point))); items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_point)));
if (_edit_point == EditAtMouse) {
items.back ().set_sensitive (false);
}
items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync))); items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync)));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());

2
gtk2_ardour/editor_ops.cc
View file

@ -3188,7 +3188,7 @@ Editor::set_sync_point (nframes64_t where, const RegionSelection& rs)
} }
XMLNode &before = region->playlist()->get_state(); XMLNode &before = region->playlist()->get_state();
region->set_sync_position (get_preferred_edit_position()); region->set_sync_position (where);
XMLNode &after = region->playlist()->get_state(); XMLNode &after = region->playlist()->get_state();
session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after)); session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
} }

10
libs/ardour/region.cc
View file

@ -803,6 +803,10 @@ Region::trim_front (nframes_t new_position, void *src)
} }
} }
/** @param new_endpoint New region end point, such that, for example,
* a region at 0 of length 10 has an endpoint of 9.
*/
void void
Region::trim_end (nframes_t new_endpoint, void */*src*/) Region::trim_end (nframes_t new_endpoint, void */*src*/)
{ {
@ -811,7 +815,7 @@ Region::trim_end (nframes_t new_endpoint, void */*src*/)
} }
if (new_endpoint > _position) { if (new_endpoint > _position) {
trim_to_internal (_position, new_endpoint - _position, this); trim_to_internal (_position, new_endpoint - _position + 1, this);
if (!_frozen) { if (!_frozen) {
recompute_at_end (); recompute_at_end ();
} }
@ -977,9 +981,7 @@ Region::set_position_locked (bool yn)
void void
Region::set_sync_position (nframes_t absolute_pos) Region::set_sync_position (nframes_t absolute_pos)
{ {
nframes_t file_pos; nframes_t const file_pos = _start + (absolute_pos - _position);
file_pos = _start + (absolute_pos - _position);
if (file_pos != _sync_position) { if (file_pos != _sync_position) {