PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[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 95345440cdb99eb7e38ff77d3eb30efbe206d79a..ed5665ddb103104866e432a272f90333132e6638 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -62,7 +62,7 @@
 #include "gui_thread.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define MUTED_ALPHA 48
 
@@ -231,23 +231,24 @@ AudioRegionView::init (bool wfd)
        }
 
        const string line_name = _region->name() + ":gain";
+
        gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()));
 
        update_envelope_visibility ();
        gain_line->reset ();
 
-       set_height (trackview.current_height()); // XXX not correct for Layered mode, but set_height() will fix later.
+       /* streamview will call set_height() */
+       //set_height (trackview.current_height()); // XXX not correct for Layered mode, but set_height() will fix later.
 
        region_muted ();
        region_sync_changed ();
 
        region_resized (ARDOUR::bounds_change);
+       /* region_resized sets ghost region duration */
 
-       for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-               (*i)->set_duration (_region->length() / samples_per_pixel);
-       }
+       /* region_locked is a synonym for region_renamed () which is called in region_muted() above */
+       //region_locked ();
 
-       region_locked ();
        envelope_active_changed ();
        fade_in_active_changed ();
        fade_out_active_changed ();
@@ -274,15 +275,6 @@ AudioRegionView::init (bool wfd)
 
        setup_waveform_visibility ();
 
-       pending_peak_data->raise_to_top ();
-
-       if (frame_handle_start) {
-               frame_handle_start->raise_to_top ();
-       }
-       if (frame_handle_end) {
-               frame_handle_end->raise_to_top ();
-       }
-
        /* XXX sync mark drag? */
 }
 
@@ -386,6 +378,7 @@ AudioRegionView::region_scale_amplitude_changed ()
        for (uint32_t n = 0; n < waves.size(); ++n) {
                waves[n]->gain_changed ();
        }
+       region_renamed ();
 }
 
 void
@@ -401,6 +394,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);
 }
@@ -449,6 +450,10 @@ AudioRegionView::region_resized (const PropertyChange& what_changed)
 void
 AudioRegionView::reset_width_dependent_items (double pixel_width)
 {
+       if (pixel_width == _width) {
+               return;
+       }
+
        RegionView::reset_width_dependent_items(pixel_width);
        assert(_pixel_width == pixel_width);
 
@@ -530,6 +535,10 @@ AudioRegionView::setup_fade_handle_positions()
 void
 AudioRegionView::set_height (gdouble height)
 {
+       if (height == _height) {
+               return;
+       }
+
        RegionView::set_height (height);
        pending_peak_data->set_y1 (height);
 
@@ -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;
@@ -1401,7 +1409,10 @@ GhostRegion*
 AudioRegionView::add_ghost (TimeAxisView& tv)
 {
        RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview);
-       assert(rtv);
+
+       if (!rtv) {
+               return 0;
+       }
 
        double unit_position = _region->position () / samples_per_pixel;
        AudioGhostRegion* ghost = new AudioGhostRegion (*this, tv, trackview, unit_position);
@@ -1614,10 +1625,12 @@ AudioRegionView::update_coverage_frames (LayerDisplay d)
 {
        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