Use a shared_ptr for SessionPlaylists so that it can be explicitly destroyed in ...

[ardour.git] / gtk2_ardour / audio_region_editor.cc

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 62fd14b16d55ddb84b1b0597c297ce556fdba6d5..1b5f51eb832a72225933f4e713f4922462a4bc8d 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -19,9 +19,11 @@
 
 #include "pbd/memento_command.h"
 
+#include "ardour/session.h"
 #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>
@@ -47,13 +49,14 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
          name_label (_("Name:")),
          audition_button (_("Play")),
          time_table (6, 2),
-         position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true),
-         end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true),
-         length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true),
-         sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("AudioRegionEditorClock"), true),
-         sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("AudioRegionEditorClock"), true),
+         position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true, false),
+         end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true, false),
+         length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, false, true),
+         sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("AudioRegionEditorClock"), true, false),
+         sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("AudioRegionEditorClock"), true, false),
          /* XXX cannot file start yet */
-         start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false)
+         start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false, false),
+         gain_adjustment(accurate_coefficient_to_dB(_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)      
 
 {
        position_clock.set_session (&_session);
@@ -125,6 +128,13 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
        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);
 
+       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,7 +153,8 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
        show_all();
 
        name_changed ();
-       bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|StartChanged|Region::SyncOffsetChanged));
+       bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|Region::SyncOffsetChanged));
+       gain_changed ();
 
        _region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed));
 
@@ -166,6 +177,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
@@ -211,6 +226,7 @@ AudioRegionEditor::connect_editor_events ()
        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));
+       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));
@@ -273,6 +289,24 @@ AudioRegionEditor::length_clock_changed ()
        length_clock.set (_region->length());
 }
 
+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 ()
 {
@@ -374,3 +408,10 @@ AudioRegionEditor::sync_offset_relative_clock_changed ()
        
        _session.commit_reversible_command ();
 }
+
+bool
+AudioRegionEditor::on_delete_event (GdkEventAny* ev)
+{
+       bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|Region::SyncOffsetChanged));
+       return RegionEditor::on_delete_event (ev);
+}