improving logic/flow for SMF type 1 files part 1:

[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 ca0e5c68a90e0ac99c50d1070dace59eee6f69ac..08e5a565bf1bea2667a2413c73e865b1445e7e8c 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
 
@@ -275,14 +275,6 @@ AudioRegionView::init (bool wfd)
 
        setup_waveform_visibility ();
 
-       /* reset_width_dependent_items() does this:
-       if (frame_handle_start) {
-               frame_handle_start->raise_to_top ();
-       }
-       if (frame_handle_end) {
-               frame_handle_end->raise_to_top ();
-       }
-       */
        /* XXX sync mark drag? */
 }
 
@@ -1409,7 +1401,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);
@@ -1620,6 +1615,11 @@ 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 (); }