remove almost everything from region editor, make popup menu more useful and accurate and informative

git-svn-id: svn://localhost/ardour2/trunk@1128 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 1 insertions, 219 deletions

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 962225ed3b..9c98fb3bab 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -45,22 +45,12 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 	  _region (r),
 	  _region_view (rv),
 	  name_label (_("NAME:")),
-	  lock_button (_("lock")),
-	  mute_button (_("mute")),
-	  opaque_button (_("opaque")),
-	  envelope_active_button(_("active")),
-	  envelope_view_button(_("visible")),
-	  raise_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT),
-	  lower_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT),
-	  layer_label (_("Layer")),
 	  audition_button (_("play")),
 	  time_table (3, 2),
 	  start_clock ("AudioRegionEditorClock", true),
 	  end_clock ("AudioRegionEditorClock", true),
 	  length_clock ("AudioRegionEditorClock", true, true),
-	  sync_offset_clock ("AudioRegionEditorClock", true, true),
-	  envelope_loop_table (1, 3),
-	  envelope_label (_("ENVELOPE"))
+	  sync_offset_clock ("AudioRegionEditorClock", true, true)
 
 {
 	start_clock.set_session (&_session);
@@ -74,57 +64,15 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 	name_hbox.pack_start (name_label, false, false);
 	name_hbox.pack_start (name_entry, false, false);
 
-	raise_button.add (raise_arrow);
-	lower_button.add (lower_arrow);
-	layer_frame.set_name ("BaseFrame");
-	layer_frame.set_shadow_type (Gtk::SHADOW_IN);
-	layer_frame.add (layer_value_label);
-	layer_label.set_name ("AudioRegionEditorLabel");
-	layer_value_label.set_name ("AudioRegionEditorLabel");
-	Gtkmm2ext::set_size_request_to_display_given_text (layer_value_label, "99", 5, 2);
-
-	layer_hbox.set_spacing (5);
-	layer_hbox.pack_start (layer_label, false, false);
-	layer_hbox.pack_start (layer_frame, false, false);
-#if 0
-	layer_hbox.pack_start (raise_button, false, false);
-	layer_hbox.pack_start (lower_button, false, false);
-#endif
-
-	mute_button.set_name ("AudioRegionEditorToggleButton");
-	opaque_button.set_name ("AudioRegionEditorToggleButton");
-	lock_button.set_name ("AudioRegionEditorToggleButton");
-	envelope_active_button.set_name ("AudioRegionEditorToggleButton");
-	envelope_view_button.set_name ("AudioRegionEditorToggleButton");
-
-	ARDOUR_UI::instance()->tooltips().set_tip (mute_button, _("mute this region"));
-	ARDOUR_UI::instance()->tooltips().set_tip (opaque_button, _("regions underneath this one cannot be heard"));
-	ARDOUR_UI::instance()->tooltips().set_tip (lock_button, _("prevent any changes to this region"));
-	ARDOUR_UI::instance()->tooltips().set_tip (envelope_active_button, _("use the gain envelope during playback"));
-	ARDOUR_UI::instance()->tooltips().set_tip (envelope_view_button, _("show the gain envelope"));
 	ARDOUR_UI::instance()->tooltips().set_tip (audition_button, _("audition this region"));
 
-	mute_button.unset_flags (Gtk::CAN_FOCUS);
-	opaque_button.unset_flags (Gtk::CAN_FOCUS);
-	lock_button.unset_flags (Gtk::CAN_FOCUS);
-	envelope_active_button.unset_flags (Gtk::CAN_FOCUS);
-	envelope_view_button.unset_flags (Gtk::CAN_FOCUS);
 	audition_button.unset_flags (Gtk::CAN_FOCUS);
 	
-	mute_button.set_events (mute_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-	opaque_button.set_events (opaque_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-	lock_button.set_events (lock_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-	envelope_active_button.set_events (envelope_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-	envelope_view_button.set_events (envelope_view_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 	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_start (mute_button, false, false);
-	top_row_button_hbox.pack_start (opaque_button, false, false);
-	top_row_button_hbox.pack_start (lock_button, false, false);
-	top_row_button_hbox.pack_start (layer_hbox, false, false, 5);
 	top_row_button_hbox.pack_end (audition_button, false, false);
 	
 	top_row_hbox.pack_start (name_hbox, true, true);
@@ -158,17 +106,8 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 	time_table.attach (length_alignment, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
 	time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
 
-	envelope_label.set_name ("AudioRegionEditorLabel");
-
-	envelope_loop_table.set_border_width (5);
-	envelope_loop_table.set_row_spacings (2);
-	envelope_loop_table.attach (envelope_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
-	envelope_loop_table.attach (envelope_active_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
-	envelope_loop_table.attach (envelope_view_button, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
-
 	lower_hbox.pack_start (time_table, true, true);
 	lower_hbox.pack_start (sep1, false, false);
-	lower_hbox.pack_start (envelope_loop_table, true, true);
 	lower_hbox.pack_start (sep2, false, false);
 
 	get_vbox()->pack_start (top_row_hbox, true, true);
@@ -188,27 +127,8 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 
 	name_changed ();
 	bounds_changed (Change (StartChanged|LengthChanged|PositionChanged));
-	envelope_active_changed ();
-	mute_changed ();
-	opacity_changed ();
-	lock_changed ();
-	layer_changed ();
 
 	XMLNode *node  = _region->extra_xml ("GUI");
-	XMLProperty *prop = 0;
-	bool showing_envelope = false;
-
-	if (node && (prop = node->property ("envelope-visible")) != 0) {
-		if (prop->value() == "yes") {
-			showing_envelope = true;
-		} 
-	} 
-
-	if (showing_envelope) {
-		envelope_view_button.set_active (true);
-	} else {
-		envelope_view_button.set_active (false);
-	}
 
 	_region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed));
 	
@@ -230,23 +150,6 @@ AudioRegionEditor::region_changed (Change what_changed)
 	if (what_changed & BoundsChanged) {
 		bounds_changed (what_changed);
 	}
-
-	if (what_changed & Region::OpacityChanged) {
-		opacity_changed ();
-	}
-	if (what_changed & Region::MuteChanged) {
-		mute_changed ();
-	}
-	if (what_changed & Region::LockChanged) {
-		lock_changed ();
-	}
-	if (what_changed & Region::LayerChanged) {
-		layer_changed ();
-	}
-
-	if (what_changed & AudioRegion::EnvelopeActiveChanged) {
-		envelope_active_changed ();
-	}
 }
 
 gint 
@@ -291,15 +194,7 @@ AudioRegionEditor::connect_editor_events ()
 	end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
 	length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed));
 
-	envelope_active_button.signal_button_press_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_press));
-	envelope_active_button.signal_button_release_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release));
 	audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
-	envelope_view_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::envelope_view_button_toggled));
-	lock_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lock_button_clicked));
-	mute_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::mute_button_clicked));
-	opaque_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::opaque_button_clicked));
-	raise_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::raise_button_clicked));
-	lower_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lower_button_clicked));
 	_session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed));
 }
 
@@ -360,27 +255,6 @@ AudioRegionEditor::length_clock_changed ()
 	length_clock.set (_region->length());
 }
 
-gint
-AudioRegionEditor::envelope_active_button_press(GdkEventButton *ev)
-{
-	return stop_signal (envelope_active_button, "button_press_event");
-}
-
-gint
-AudioRegionEditor::envelope_active_button_release (GdkEventButton *ev)
-{
-	_region->set_envelope_active (!_region->envelope_active());
-	return stop_signal (envelope_active_button, "button_release_event");
-}
-
-void
-AudioRegionEditor::envelope_view_button_toggled ()
-{
-	bool visible = envelope_view_button.get_active ();
-
-	_region_view.set_envelope_visible (visible);
-}
-
 void
 AudioRegionEditor::audition_button_toggled ()
 {
@@ -392,56 +266,6 @@ AudioRegionEditor::audition_button_toggled ()
 }
 
 void
-AudioRegionEditor::raise_button_clicked ()
-{
-	_region->raise ();
-}
-
-void
-AudioRegionEditor::lower_button_clicked ()
-{
-	_region->lower ();
-}
-
-void
-AudioRegionEditor::opaque_button_clicked ()
-{
-	bool ractive = _region->opaque();
-
-	if (opaque_button.get_active() != ractive) {
-		_region->set_opaque (!ractive);
-	}
-}
-
-void
-AudioRegionEditor::mute_button_clicked ()
-{
-	bool ractive = _region->muted();
-
-	if (mute_button.get_active() != ractive) {
-		_region->set_muted (!ractive);
-	}
-}
-
-void
-AudioRegionEditor::lock_button_clicked ()
-{
-	bool ractive = _region->locked();
-
-	if (lock_button.get_active() != ractive) {
-		_region->set_locked (!ractive);
-	}
-}
-
-void
-AudioRegionEditor::layer_changed ()
-{
-	char buf[8];
-	snprintf (buf, sizeof(buf), "%d", (int) _region->layer() + 1);
-	layer_value_label.set_text (buf);
-}
-
-void
 AudioRegionEditor::name_changed ()
 {
 	if (name_entry.get_text() != _region->name()) {
@@ -450,48 +274,6 @@ AudioRegionEditor::name_changed ()
 }
 
 void
-AudioRegionEditor::lock_changed ()
-{
-	bool yn;
-
-	if ((yn = _region->locked()) != lock_button.get_active()) {
-		lock_button.set_active (yn);
-	}
-
-	start_clock.set_sensitive (!yn);
-	end_clock.set_sensitive (!yn);
-	length_clock.set_sensitive (!yn);
-}
-
-void
-AudioRegionEditor::envelope_active_changed ()
-{
-	bool yn;
-
-	if ((yn = _region->envelope_active()) != envelope_active_button.get_active()) {
-		envelope_active_button.set_active (yn);
-	}
-}
-
-void
-AudioRegionEditor::opacity_changed ()
-{
-	bool yn;
-	if ((yn = _region->opaque()) != opaque_button.get_active()) {
-		opaque_button.set_active (yn);
-	}
-}
-
-void
-AudioRegionEditor::mute_changed ()
-{
-	bool yn;
-	if ((yn = _region->muted()) != mute_button.get_active()) {
-		mute_button.set_active (yn);
-	}
-}
-
-void
 AudioRegionEditor::bounds_changed (Change what_changed)
 {
 	if (what_changed & Change ((PositionChanged|LengthChanged))) {