2 patches inspired from 3.0. remove unused butler buffers(drobilla), and region gain (colinf)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5952 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 42 insertions, 3 deletions

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 288f2b4556..76d8de9d05 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -22,6 +22,7 @@
 #include <ardour/audioregion.h>
 #include <ardour/playlist.h>
 #include <ardour/utils.h>
+#include <ardour/dB.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <cmath>
@@ -52,8 +53,8 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 	  length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true),
 	  /* XXX cannot edit sync point or start yet */
 	  sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), false),
-	  start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false)
-
+	  start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false),
+	gain_adjustment(accurate_coefficient_to_dB(_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
 {
 	position_clock.set_session (&_session);
 	end_clock.set_session (&_session);
@@ -124,6 +125,20 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 	time_table.attach (start_alignment, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL);
 	time_table.attach (start_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL);
 
+	gain_label.set_name ("AudioRegionEditorLabel");
+	gain_label.set_text (_("Scale amplitude:"));
+	gain_label.set_alignment (1, 0.5);
+	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);
+		
+	gain_label.set_name ("AudioRegionEditorLabel");
+	gain_label.set_text (_("Scale amplitude:"));
+	gain_label.set_alignment (1, 0.5);
+	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);
+	
 	lower_hbox.pack_start (time_table, true, true);
 	lower_hbox.pack_start (sep1, false, false);
 	lower_hbox.pack_start (sep2, false, false);
@@ -143,6 +158,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 
 	name_changed ();
 	bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|StartChanged|Region::SyncOffsetChanged));
+	gain_changed ();
 
 	_region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed));
 	
@@ -165,6 +181,10 @@ AudioRegionEditor::region_changed (Change what_changed)
 	if (what_changed & Change (BoundsChanged|StartChanged|Region::SyncOffsetChanged)) {
 		bounds_changed (what_changed);
 	}
+
+	if (what_changed & AudioRegion::ScaleAmplitudeChanged) {
+		gain_changed ();
+	}
 }
 
 gint 
@@ -208,7 +228,8 @@ AudioRegionEditor::connect_editor_events ()
 	position_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::position_clock_changed));
 	end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
 	length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed));
-
+	gain_adjustment.signal_value_changed().connect (mem_fun (*this, &AudioRegionEditor::gain_adjustment_changed));
+ 
 	audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
 	_session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed));
 }
@@ -271,6 +292,24 @@ AudioRegionEditor::length_clock_changed ()
 }
 
 void
+AudioRegionEditor::gain_changed ()
+{
+	float const region_gain_dB = accurate_coefficient_to_dB (_region->scale_amplitude());
+	if (region_gain_dB != gain_adjustment.get_value()) {
+		gain_adjustment.set_value(region_gain_dB);
+	}
+}
+
+void
+AudioRegionEditor::gain_adjustment_changed ()
+{
+	float const gain = dB_to_coefficient (gain_adjustment.get_value());
+	if (_region->scale_amplitude() != gain) {
+		_region->set_scale_amplitude (gain);
+	}
+}
+
+void
 AudioRegionEditor::audition_button_toggled ()
 {
 	if (audition_button.get_active()) {