#include "ardour/playlist.h"
#include "ardour/utils.h"
#include "ardour/dB.h"
-#include <gtkmm2ext/utils.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 "gui_thread.h"
+#include "region_editor.h"
+#include "utils.h"
#include "i18n.h"
using namespace Gtkmm2ext;
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
- : ArdourDialog (_("Region")),
- _table (8, 2),
- _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)
+ : ArdourDialog (_("Region"))
+ , _table (9, 2)
+ , _table_row (0)
+ , _region (r)
+ , name_label (_("Name:"))
+ , audition_button (_("Play"))
+ , _clock_group (new ClockGroup)
+ , 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)
{
set_session (s);
+
+ _clock_group->set_clock_mode (AudioClock::Frames);
+ _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);
sync_absolute_label.set_text (_("Sync point (absolute):"));
start_label.set_name ("RegionEditorLabel");
start_label.set_text (_("File start:"));
+ _sources_label.set_name ("RegionEditorLabel");
+
+ if (_region->n_channels() > 1) {
+ _sources_label.set_text (_("Sources:"));
+ } else {
+ _sources_label.set_text (_("Source:"));
+ }
_table.set_col_spacings (12);
_table.set_row_spacings (6);
sync_relative_label.set_alignment (1, 0.5);
sync_absolute_label.set_alignment (1, 0.5);
start_label.set_alignment (1, 0.5);
+ _sources_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);
+ _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_row;
- _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 (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_row;
- _table.attach (end_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
- _table.attach (end_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
+ _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_row;
- _table.attach (length_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL);
- _table.attach (length_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL);
+ _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_row;
- _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);
+ _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_row;
- _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 (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_row;
- _table.attach (start_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL);
- _table.attach (start_clock, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL);
+ _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_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_row;
+
get_vbox()->pack_start (_table, true, true);
add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
set_title (string_compose (_("Region '%1'"), _region->name()));
+ for (uint32_t i = 0; i < _region->n_channels(); ++i) {
+ _sources.append_text (_region->source(i)->name());
+ }
+
+ _sources.set_headers_visible (false);
+ Gtk::CellRendererText* t = dynamic_cast<Gtk::CellRendererText*> (_sources.get_column_cell_renderer(0));
+ assert (t);
+ t->property_ellipsize() = Pango::ELLIPSIZE_END;
+
show_all();
name_changed ();
connect_editor_events ();
}
+RegionEditor::~RegionEditor ()
+{
+ delete _clock_group;
+}
+
void
RegionEditor::region_changed (const PBD::PropertyChange& what_changed)
{
void
RegionEditor::length_clock_changed ()
{
- nframes_t frames = length_clock.current_time();
+ framecnt_t frames = length_clock.current_time();
_session->begin_reversible_command (_("change region length"));
if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
int dir;
- nframes_t off = _region->sync_offset (dir);
+ frameoffset_t off = _region->sync_offset (dir);
if (dir == -1) {
off = -off;
}
}
bool
-RegionEditor::on_delete_event (GdkEventAny* ev)
+RegionEditor::on_delete_event (GdkEventAny*)
{
PropertyChange change;