Fix use-after free (signal after deleting group)

[ardour.git] / gtk2_ardour / audio_region_view.cc

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 08e5a565bf1bea2667a2413c73e865b1445e7e8c..8799913c7034a13b234fec251d55d7c00b055d94 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -51,6 +51,7 @@
 #include "streamview.h"
 #include "audio_region_view.h"
 #include "audio_time_axis.h"
+#include "enums_convert.h"
 #include "public_editor.h"
 #include "audio_region_editor.h"
 #include "audio_streamview.h"
@@ -378,6 +379,7 @@ AudioRegionView::region_scale_amplitude_changed ()
        for (uint32_t n = 0; n < waves.size(); ++n) {
                waves[n]->gain_changed ();
        }
+       region_renamed ();
 }
 
 void
@@ -393,6 +395,14 @@ AudioRegionView::region_renamed ()
                str = string ("!") + str;
        }
 
+
+       boost::shared_ptr<AudioRegion> ar (audio_region());
+       if (ar->scale_amplitude() != 1.0) {
+               char tmp[32];
+               snprintf (tmp, 32, " (%.1fdB)", accurate_coefficient_to_dB (ar->scale_amplitude()));
+               str += tmp;
+       }
+
        set_item_name (str, this);
        set_name_text (str);
 }
@@ -1289,11 +1299,10 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
                pending_peak_data->hide ();
 
                /* Restore stacked coverage */
-               std::string str = trackview.gui_property ("layer-display");
-               if (!str.empty()) {
-                       LayerDisplay layer_display;
-                       update_coverage_frames (LayerDisplay (string_2_enum (str, layer_display)));
-               }
+               LayerDisplay layer_display;
+               if (trackview.get_gui_property ("layer-display", layer_display)) {
+                       update_coverage_frames (layer_display);
+         }
        }
 
        /* channel wave created, don't hook into peaks ready anymore */
@@ -1338,11 +1347,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b
        /* don't create points that can't be seen */
 
        update_envelope_visibility ();
-
        framepos_t rpos = region ()->position ();
-       framepos_t fx = trackview.editor().pixel_to_sample (mx) + rpos;
-       trackview.editor ().snap_to_with_modifier (fx, ev);
-       fx -= rpos;
+       MusicFrame snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0);
+       trackview.editor ().snap_to_with_modifier (snap_pos, ev);
+       framepos_t fx = snap_pos.frame - rpos;
 
        if (fx > _region->length()) {
                return;
@@ -1615,17 +1623,14 @@ AudioRegionView::set_fade_visibility (bool yn)
 void
 AudioRegionView::update_coverage_frames (LayerDisplay d)
 {
-       if (d != Stacked) {
-               /* don't do coverage frames unless we're in stacked mode */
-               return;
-       }
-
        RegionView::update_coverage_frames (d);
 
-       if (fade_in_handle)       { fade_in_handle->raise_to_top (); }
-       if (fade_out_handle)      { fade_out_handle->raise_to_top (); }
-       if (fade_in_trim_handle)  { fade_in_trim_handle->raise_to_top (); }
-       if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); }
+       if (d == Stacked) {
+               if (fade_in_handle)       { fade_in_handle->raise_to_top (); }
+               if (fade_out_handle)      { fade_out_handle->raise_to_top (); }
+               if (fade_in_trim_handle)  { fade_in_trim_handle->raise_to_top (); }
+               if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); }
+       }
 }
 
 void