Fix reference of track after free() (#4795).

[ardour.git] / gtk2_ardour / audio_streamview.cc

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 8e54c6c938d0cff0dcae63bdad09890c36dd28d6..c7afa6e3bf5e087813ea45aca72bbd0b85111f3b 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -70,6 +70,9 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
 
 AudioStreamView::~AudioStreamView ()
 {
+       for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
+               delete xi->second;
+       }
 }
 
 int
@@ -121,7 +124,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                if (recording) {
                        region_view = new AudioRegionView (_canvas_group, _trackview, region,
                                        _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
-                                                       TimeAxisViewItem::ShowFrame | 
+                                                       TimeAxisViewItem::ShowFrame |
                                                        TimeAxisViewItem::HideFrameRight |
                                                        TimeAxisViewItem::HideFrameLeft |
                                                        TimeAxisViewItem::HideFrameTB));
@@ -163,7 +166,7 @@ RegionView*
 AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool recording)
 {
        RegionView *region_view = create_region_view (r, wait_for_waves, recording);
-       
+
        if (region_view == 0) {
                return 0;
        }
@@ -483,8 +486,8 @@ AudioStreamView::setup_rec_box ()
                                                        + _trackview.track()->get_captured_frames(rec_regions.size()-1);
                                }
 
-                               PropertyList plist; 
-                               
+                               PropertyList plist;
+
                                plist.add (Properties::start, start);
                                plist.add (Properties::length, 1);
                                plist.add (Properties::name, string());
@@ -494,7 +497,7 @@ AudioStreamView::setup_rec_box ()
                                        boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
 
                                assert(region);
-                               region->set_position (_trackview.session()->transport_frame(), this);
+                               region->set_position (_trackview.session()->transport_frame());
                                rec_regions.push_back (make_pair(region, (RegionView*) 0));
                        }
 
@@ -636,44 +639,44 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
        if (!Config->get_show_waveforms_while_recording ()) {
                return;
        }
-       
+
        uint32_t n = 0;
-       
+
        for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
-               
+
                list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
                ++tmp;
 
                assert (n < rec_rects.size());
-               
+
                if (!canvas_item_visible (rec_rects[n].rectangle)) {
                        /* rect already hidden, this region is done */
                        iter = tmp;
                        continue;
                }
-               
+
                boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
-               
+
                if (!region) {
                        iter = tmp;
                        continue;
                }
-               
+
                framecnt_t origlen = region->length();
 
                if (region == rec_regions.back().first && rec_active) {
-                       
+
                        if (last_rec_data_frame > region->start()) {
-                               
+
                                framecnt_t nlen = last_rec_data_frame - region->start();
-                               
+
                                if (nlen != region->length()) {
 
                                        region->suspend_property_changes ();
-                                       region->set_position (_trackview.track()->get_capture_start_frame(n), this);
-                                       region->set_length (nlen, this);
+                                       region->set_position (_trackview.track()->get_capture_start_frame(n));
+                                       region->set_length (nlen);
                                        region->resume_property_changes ();
-                                       
+
                                        if (origlen == 1) {
                                                /* our special initial length */
                                                add_region_view_internal (region, false, true);
@@ -681,7 +684,7 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
                                        }
 
                                        check_record_layers (region, (region->position() - region->start() + start + cnt));
-                                       
+
                                        /* also update rect */
                                        ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
                                        gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
@@ -689,16 +692,16 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
                                }
 
                        } else {
-                               
+
                                framecnt_t nlen = _trackview.track()->get_captured_frames(n);
-                               
+
                                if (nlen != region->length()) {
-                                       
+
                                        if (region->source_length(0) >= region->start() + nlen) {
 
                                                region->suspend_property_changes ();
-                                               region->set_position (_trackview.track()->get_capture_start_frame(n), this);
-                                               region->set_length (nlen, this);
+                                               region->set_position (_trackview.track()->get_capture_start_frame(n));
+                                               region->set_length (nlen);
                                                region->resume_property_changes ();
 
                                                if (origlen == 1) {
@@ -806,13 +809,14 @@ AudioStreamView::update_contents_height ()
 void
 AudioStreamView::update_content_height (CrossfadeView* cv)
 {
-       if (_layer_display == Overlaid) {
-
+       switch (_layer_display) {
+       case Overlaid:
                cv->set_y (0);
-               cv->set_height (height);
-
-       } else {
+               cv->set_heights (height, height);
+               break;
 
+       case Stacked:
+       case Expanded:
                layer_t const inl = cv->crossfade->in()->layer ();
                layer_t const outl = cv->crossfade->out()->layer ();
 
@@ -821,9 +825,13 @@ AudioStreamView::update_content_height (CrossfadeView* cv)
 
                const double h = child_height ();
 
-               cv->set_y ((_layers - high - 1) * h);
-               cv->set_height ((high - low + 1) * h);
-
+               if (_layer_display == Stacked) {
+                       cv->set_y ((_layers - high - 1) * h);
+                       cv->set_heights ((high - low + 1) * h, h);
+               } else {
+                       cv->set_y (((_layers - high) * 2 - 1) * h);
+                       cv->set_heights (((high - low) * 2 + 1) * h, h);
+               }
        }
 }
 
@@ -843,7 +851,7 @@ void
 AudioStreamView::horizontal_position_changed ()
 {
        /* we only `draw' the bit of the curve that is visible, so we need to update here */
-       
+
        for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
                i->second->horizontal_position_changed ();
        }