X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_editor.cc;h=36c648b7128d71815777a4aa52693d614359a5bb;hb=76f9764a440231722fbf256a07dc8f88eb2ab64c;hp=d6d4d877aea2432446e34598b43d37981dc8a767;hpb=e2b48e90df2b6282dfd8270b3bb771398c13e715;p=ardour.git

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
old mode 100755
new mode 100644
index d6d4d877ae..36c648b712
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -17,24 +17,28 @@
 
 */
 
+#include <cmath>
+
+#include <gtkmm/listviewtext.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "ardour/session.h"
+#include "widgets/tooltips.h"
+
 #include "ardour/region.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/dB.h"
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <cmath>
+#include "ardour/session.h"
+#include "ardour/source.h"
 
-#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 "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -42,21 +46,34 @@ using namespace std;
 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),
+	: 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, X_("RegionEditorClock"), false, false)
+	, start_clock (X_("regionstart"), true, "", false, false)
+	, _sources (1)
 {
 	set_session (s);
-	
+
+	_clock_group->set_clock_mode (ARDOUR_UI::instance()->primary_clock->mode());
+	ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &RegionEditor::set_clock_mode_from_primary));
+
+	_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);
@@ -64,7 +81,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	sync_offset_absolute_clock.set_session (_session);
 	start_clock.set_session (_session);
 
-	ARDOUR_UI::instance()->set_tip (audition_button, _("audition this region"));
+	ArdourWidgets::set_tooltip (audition_button, _("audition this region"));
 
 	audition_button.unset_flags (Gtk::CAN_FOCUS);
 
@@ -84,6 +101,13 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	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);
@@ -96,32 +120,44 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	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);
+	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::EXPAND, Gtk::FILL);
+	++_table_row;
 
-	_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 (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::EXPAND, 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 (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::EXPAND, 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 (length_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL);
-	_table.attach (length_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);
- 
- 	_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 (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::EXPAND, 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 (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::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::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::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::EXPAND, Gtk::FILL);
+	++_table_row;
 
 	get_vbox()->pack_start (_table, true, true);
 
@@ -130,11 +166,19 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	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()));
 
+	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 ();
@@ -148,13 +192,24 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 
 	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::set_clock_mode_from_primary ()
+{
+	_clock_group->set_clock_mode (ARDOUR_UI::instance()->primary_clock->mode());
+}
+
 void
 RegionEditor::region_changed (const PBD::PropertyChange& what_changed)
 {
@@ -220,39 +275,47 @@ RegionEditor::connect_editor_events ()
 
 	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) {
-		_region->clear_history ();
-		_region->set_position (position_clock.current_time(), this);
+		PublicEditor::instance().begin_reversible_command (_("change region start position"));
+		in_command = true;
+
+		_region->clear_changes ();
+		_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) {
-                _region->clear_history ();
-		_region->trim_end (end_clock.current_time(), this);
+		PublicEditor::instance().begin_reversible_command (_("change region end position"));
+		in_command = true;
+
+		_region->clear_changes ();
+		_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);
 }
@@ -260,19 +323,22 @@ RegionEditor::end_clock_changed ()
 void
 RegionEditor::length_clock_changed ()
 {
-	nframes_t frames = length_clock.current_time();
-
-	_session->begin_reversible_command (_("change region length"));
-
+	samplecnt_t samples = length_clock.current_time();
+	bool in_command = false;
 	boost::shared_ptr<Playlist> pl = _region->playlist();
 
 	if (pl) {
-                _region->clear_history ();
-		_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() + samples - 1);
 		_session->add_command(new StatefulDiffCommand (_region));
 	}
 
-	_session->commit_reversible_command ();
+	if (in_command) {
+		PublicEditor::instance().commit_reversible_command ();
+	}
 
 	length_clock.set (_region->length());
 }
@@ -312,7 +378,7 @@ RegionEditor::bounds_changed (const PropertyChange& what_changed)
 
 	if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
 		int dir;
-		nframes_t off = _region->sync_offset (dir);
+		sampleoffset_t off = _region->sync_offset (dir);
 		if (dir == -1) {
 			off = -off;
 		}
@@ -356,29 +422,29 @@ RegionEditor::audition_state_changed (bool yn)
 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_history ();
+	_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_history ();
+	_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
-RegionEditor::on_delete_event (GdkEventAny* ev)
+RegionEditor::on_delete_event (GdkEventAny*)
 {
 	PropertyChange change;