Small cleanups to port matrix context menu.
[ardour.git] / gtk2_ardour / audio_streamview.cc
index fdfef33e9174afdf992b6226cfe5d46dc79e9b4c..6ce08aa5ebc6c8978193c0ad5843721993b8582d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2006 Paul Davis 
+    Copyright (C) 2001, 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,6 +32,8 @@
 #include "ardour/source.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
 #include "audio_streamview.h"
 #include "audio_region_view.h"
@@ -55,14 +57,14 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 
-AudioStreamView::AudioStreamView (AudioTimeAxisViewPtr tv)
+AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
        : StreamView (tv)
 {
        crossfades_visible = true;
        color_handler ();
        _amplitude_above_axis = 1.0;
 
-       use_rec_regions = tv->editor().show_waveforms_recording ();
+       use_rec_regions = tv.editor().show_waveforms_recording ();
 
        Config->ParameterChanged.connect (sigc::mem_fun (*this, &AudioStreamView::parameter_changed));
 }
@@ -71,19 +73,19 @@ AudioStreamView::~AudioStreamView ()
 {
 }
 
-int 
+int
 AudioStreamView::set_samples_per_unit (gdouble spp)
 {
        StreamView::set_samples_per_unit(spp);
 
        for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               (*xi)->set_samples_per_unit (spp);
+               xi->second->set_samples_per_unit (spp);
        }
 
        return 0;
 }
 
-int 
+int
 AudioStreamView::set_amplitude_above_axis (gdouble app)
 {
        RegionViewList::iterator i;
@@ -113,21 +115,21 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                return 0;
        }
 
-       switch (_trackview->audio_track()->mode()) {
-       
+       switch (_trackview.audio_track()->mode()) {
+
        case NonLayered:
        case Normal:
                if (recording) {
-                       region_view = new AudioRegionView (canvas_group, _trackview, region, 
+                       region_view = new AudioRegionView (canvas_group, _trackview, region,
                                        _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
                                                        TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight));
                } else {
-                       region_view = new AudioRegionView (canvas_group, _trackview, region, 
+                       region_view = new AudioRegionView (canvas_group, _trackview, region,
                                        _samples_per_unit, region_color);
                }
                break;
        case Destructive:
-               region_view = new TapeAudioRegionView (canvas_group, _trackview, region, 
+               region_view = new TapeAudioRegionView (canvas_group, _trackview, region,
                                _samples_per_unit, region_color);
                break;
        default:
@@ -140,8 +142,8 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
        region_view->set_amplitude_above_axis(_amplitude_above_axis);
        region_view->set_height (child_height ());
 
-       /* if its the special single-sample length that we use for rec-regions, make it 
-          insensitive to events 
+       /* if its the special single-sample length that we use for rec-regions, make it
+          insensitive to events
        */
 
        if (region->length() == 1) {
@@ -152,7 +154,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
        region_view->set_waveform_shape (Config->get_waveform_shape ());
        region_view->set_waveform_visible (Config->get_show_waveforms ());
 
-       return region_view;     
+       return region_view;
 }
 
 RegionView*
@@ -168,7 +170,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 //                     if ((*i)->region() == r) {
 //                             cerr << "audio_streamview in add_region_view_internal region found" << endl;
                                /* great. we already have a AudioRegionView for this Region. use it again. */
-                               
+
 //                             (*i)->set_valid (true);
 
                                // this might not be necessary
@@ -178,7 +180,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 //                                     arv->set_waveform_scale (_waveform_scale);
 //                                     arv->set_waveform_shape (_waveform_shape);
 //                             }
-                                       
+
 //                             return NULL;
 //                     }
 //             }
@@ -205,20 +207,20 @@ AudioStreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
                return;
        }
 
-       if (!_trackview->session().deletion_in_progress()) {
+       if (!_trackview.session().deletion_in_progress()) {
+
+               for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end();) {
+                       CrossfadeViewList::iterator tmp;
 
-               for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end();) {
-                       list<CrossfadeView*>::iterator tmp;
-                       
                        tmp = i;
                        ++tmp;
-                       
+
                        boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
-                       if (ar && (*i)->crossfade->involves (ar)) {
-                               delete *i;
+                       if (ar && i->second->crossfade->involves (ar)) {
+                               delete i->second;
                                crossfade_views.erase (i);
                        }
-                       
+
                        i = tmp;
                }
        }
@@ -232,7 +234,7 @@ AudioStreamView::undisplay_diskstream ()
        StreamView::undisplay_diskstream();
 
        for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               delete *i;
+               delete i->second;
        }
 
        crossfade_views.clear ();
@@ -254,11 +256,11 @@ AudioStreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
        ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_modified_weak), ds));
 
        StreamView::playlist_modified (ds);
-       
+
        /* make sure xfades are on top and all the regionviews are stacked correctly. */
 
-       for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               (*i)->get_canvas_group()->raise_to_top();
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               i->second->get_canvas_group()->raise_to_top();
        }
 }
 
@@ -306,22 +308,20 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
        AudioRegionView* rview = 0;
 
        /* we do not allow shared_ptr<T> to be bound to slots */
-       
+
        ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade_weak), boost::weak_ptr<Crossfade> (crossfade)));
 
        /* first see if we already have a CrossfadeView for this Crossfade */
 
-       for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if ((*i)->crossfade == crossfade) {
-
-                       if (!crossfades_visible || _layer_display == Stacked) {
-                               (*i)->hide();
-                       } else {
-                               (*i)->show ();
-                       }
-                       (*i)->set_valid (true);
-                       return;
+       CrossfadeViewList::iterator i = crossfade_views.find (crossfade);
+       if (i != crossfade_views.end()) {
+               if (!crossfades_visible) {
+                       i->second->hide();
+               } else {
+                       i->second->show ();
                }
+               i->second->set_valid (true);
+               return;
        }
 
        /* create a new one */
@@ -337,7 +337,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
                }
        }
 
-       CrossfadeView *cv = new CrossfadeView (_trackview->canvas_display (),
+       CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display (),
                                               _trackview,
                                                crossfade,
                                               _samples_per_unit,
@@ -345,10 +345,12 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
                                               *lview, *rview);
        cv->set_valid (true);
        crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade));
-       crossfade_views.push_back (cv);
-       if (!_trackview->session().config.get_xfades_visible() || !crossfades_visible || _layer_display == Stacked) {
+       crossfade_views[cv->crossfade] = cv;
+       if (!_trackview.session().config.get_xfades_visible() || !crossfades_visible) {
                cv->hide ();
        }
+
+       update_content_height (cv);
 }
 
 void
@@ -358,9 +360,9 @@ AudioStreamView::remove_crossfade (boost::shared_ptr<Region> r)
 
        boost::shared_ptr<Crossfade> xfade = boost::dynamic_pointer_cast<Crossfade> (r);
 
-       for (list<CrossfadeView*>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if ((*i)->crossfade == xfade) {
-                       delete *i;
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               if (i->second->crossfade == xfade) {
+                       delete i->second;
                        crossfade_views.erase (i);
                        break;
                }
@@ -371,7 +373,7 @@ void
 AudioStreamView::redisplay_diskstream ()
 {
        list<RegionView *>::iterator i;
-       list<CrossfadeView*>::iterator xi, tmpx;
+       CrossfadeViewList::iterator xi, tmpx;
 
        // Flag region views as invalid and disable drawing
        for (i = region_views.begin(); i != region_views.end(); ++i) {
@@ -381,35 +383,35 @@ AudioStreamView::redisplay_diskstream ()
 
        // Flag crossfade views as invalid
        for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               (*xi)->set_valid (false);
-               if ((*xi)->visible() && _layer_display != Stacked) {
-                       (*xi)->show ();
+               xi->second->set_valid (false);
+               if (xi->second->visible()) {
+                       xi->second->show ();
                }
        }
 
        // Add and display region and crossfade views, and flag them as valid
 
-       if (_trackview->is_audio_track()) {
-               _trackview->get_diskstream()->playlist()->foreach_region(
+       if (_trackview.is_audio_track()) {
+               _trackview.get_diskstream()->playlist()->foreach_region(
                        sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))
                        );
 
                boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(
-                               _trackview->get_diskstream()->playlist()
+                               _trackview.get_diskstream()->playlist()
                        );
-               
+
                if (apl) {
                        apl->foreach_crossfade (sigc::mem_fun (*this, &AudioStreamView::add_crossfade));
                }
        }
-       
+
        // Remove invalid crossfade views
        for (xi = crossfade_views.begin(); xi != crossfade_views.end();) {
                tmpx = xi;
                tmpx++;
 
-               if (!(*xi)->valid()) {
-                       delete *xi;
+               if (!xi->second->valid()) {
+                       delete xi->second;
                        crossfade_views.erase (xi);
                }
 
@@ -439,7 +441,7 @@ AudioStreamView::set_waveform_shape (WaveformShape shape)
                if (arv)
                        arv->set_waveform_shape (shape);
        }
-}              
+}
 
 void
 AudioStreamView::set_waveform_scale (WaveformScale scale)
@@ -450,72 +452,73 @@ AudioStreamView::set_waveform_scale (WaveformScale scale)
                        arv->set_waveform_scale (scale);
                }
        }
-}              
+}
 
 void
 AudioStreamView::setup_rec_box ()
 {
-       //cerr << _trackview->name() << " streamview SRB region_views.size() = " << region_views.size() << endl;
+       //cerr << _trackview.name() << " streamview SRB region_views.size() = " << region_views.size() << endl;
 
-       if (_trackview->session().transport_rolling()) {
+       if (_trackview.session().transport_rolling()) {
 
                // cerr << "\trolling\n";
 
-               if (!rec_active && 
-                   _trackview->session().record_status() == Session::Recording && 
-                   _trackview->get_diskstream()->record_enabled()) {
-                       if (_trackview->audio_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) {
+               if (!rec_active &&
+                   _trackview.session().record_status() == Session::Recording &&
+                   _trackview.get_diskstream()->record_enabled()) {
+                       if (_trackview.audio_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) {
 
                                /* add a new region, but don't bother if they set use_rec_regions mid-record */
 
                                SourceList sources;
 
-                               for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) {
+                               for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin();
+                                               prc != rec_data_ready_connections.end(); ++prc) {
                                        (*prc).disconnect();
                                }
                                rec_data_ready_connections.clear();
-                                       
-                               // FIXME
-                               boost::shared_ptr<AudioDiskstream> ads = boost::dynamic_pointer_cast<AudioDiskstream>(_trackview->get_diskstream());
-                               assert(ads);
+
+                               boost::shared_ptr<AudioDiskstream> ads = _trackview.audio_track()->audio_diskstream();
 
                                for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) {
-                                       boost::shared_ptr<AudioFileSource> src = boost::static_pointer_cast<AudioFileSource> (ads->write_source (n));
+                                       boost::shared_ptr<AudioFileSource> src = ads->write_source (n);
                                        if (src) {
                                                sources.push_back (src);
-                                               
+
                                                rec_data_ready_connections.push_back (src->PeakRangeReady.connect (bind
-                                                       (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), boost::weak_ptr<Source>(src)))); 
+                                                       (mem_fun (*this, &AudioStreamView::rec_peak_range_ready),
+                                                        boost::weak_ptr<Source>(src))));
                                        }
                                }
 
                                // handle multi
-                               
+
                                nframes_t start = 0;
                                if (rec_regions.size() > 0) {
-                                       start = rec_regions.back().first->start() + _trackview->get_diskstream()->get_captured_frames(rec_regions.size()-1);
+                                       start = rec_regions.back().first->start()
+                                                       + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
                                }
-                               
-                               boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion>
-                                                                      (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags), false)));
+
+                               boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion>(
+                                               RegionFactory::create (sources, start, 1, "", 0, Region::DefaultFlags, false)));
                                assert(region);
                                region->block_property_changes ();
-                               region->set_position (_trackview->session().transport_frame(), this);
+                               region->set_position (_trackview.session().transport_frame(), this);
                                rec_regions.push_back (make_pair(region, (RegionView*)0));
                        }
-                       
+
                        /* start a new rec box */
 
                        boost::shared_ptr<AudioTrack> at;
 
-                       at = _trackview->audio_track(); /* we know what it is already */
+                       at = _trackview.audio_track(); /* we know what it is already */
                        boost::shared_ptr<AudioDiskstream> ds = at->audio_diskstream();
                        nframes_t frame_pos = ds->current_capture_start ();
-                       gdouble xstart = _trackview->editor().frame_to_pixel (frame_pos);
+                       gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
                        gdouble xend;
                        uint32_t fill_color;
 
-                       switch (_trackview->audio_track()->mode()) {
+                       switch (_trackview.audio_track()->mode()) {
                        case Normal:
                        case NonLayered:
                                xend = xstart;
@@ -531,7 +534,7 @@ AudioStreamView::setup_rec_box ()
                                fill_color = UINT_RGBA_CHANGE_A (fill_color, 120);
                                break;
                        }
-                       
+
                        ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
                        rec_rect->property_x1() = xstart;
                        rec_rect->property_y1() = 1.0;
@@ -541,27 +544,28 @@ AudioStreamView::setup_rec_box ()
                        rec_rect->property_outline_what() = 0x1 | 0x2 | 0x4 | 0x8;
                        rec_rect->property_fill_color_rgba() = fill_color;
                        rec_rect->lower_to_bottom();
-                       
+
                        RecBoxInfo recbox;
                        recbox.rectangle = rec_rect;
-                       recbox.start = _trackview->session().transport_frame();
+                       recbox.start = _trackview.session().transport_frame();
                        recbox.length = 0;
-                       
+
                        rec_rects.push_back (recbox);
-                       
+
                        screen_update_connection.disconnect();
-                       screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &AudioStreamView::update_rec_box));   
+                       screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+                                       mem_fun (*this, &AudioStreamView::update_rec_box));
                        rec_updating = true;
                        rec_active = true;
 
                } else if (rec_active &&
-                          (_trackview->session().record_status() != Session::Recording ||
-                           !_trackview->get_diskstream()->record_enabled())) {
+                          (_trackview.session().record_status() != Session::Recording ||
+                           !_trackview.get_diskstream()->record_enabled())) {
                        screen_update_connection.disconnect();
                        rec_active = false;
                        rec_updating = false;
                }
-               
+
        } else {
 
                // cerr << "\tNOT rolling, rec_rects = " << rec_rects.size() << " rec_regions = " << rec_regions.size() << endl;
@@ -571,14 +575,15 @@ AudioStreamView::setup_rec_box ()
                        /* disconnect rapid update */
                        screen_update_connection.disconnect();
 
-                       for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) {
+                       for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin();
+                                       prc != rec_data_ready_connections.end(); ++prc) {
                                (*prc).disconnect();
                        }
                        rec_data_ready_connections.clear();
 
                        rec_updating = false;
                        rec_active = false;
-                       
+
                        /* remove temp regions */
 
                        for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) {
@@ -591,7 +596,7 @@ AudioStreamView::setup_rec_box ()
 
                                iter = tmp;
                        }
-                               
+
                        rec_regions.clear();
 
                        // cerr << "\tclear " << rec_rects.size() << " rec rects\n";
@@ -601,9 +606,9 @@ AudioStreamView::setup_rec_box ()
                                RecBoxInfo &rect = (*iter);
                                delete rect.rectangle;
                        }
-                       
+
                        rec_rects.clear();
-                       
+
                }
        }
 }
@@ -611,8 +616,8 @@ AudioStreamView::setup_rec_box ()
 void
 AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void))
 {
-       for (list<CrossfadeView*>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               ((*i)->*pmf) ();
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               (i->second->*pmf) ();
        }
 }
 
@@ -620,22 +625,22 @@ void
 AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<Source> weak_src)
 {
        ENSURE_GUI_THREAD(bind (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), start, cnt, weak_src));
-       
+
        boost::shared_ptr<Source> src (weak_src.lock());
 
        if (!src) {
-               return; 
+               return;
        }
 
        // this is called from the peak building thread
-       
-       if (rec_data_ready_map.size() == 0 || start+cnt > last_rec_data_frame) {
+
+       if (rec_data_ready_map.size() == 0 || start + cnt > last_rec_data_frame) {
                last_rec_data_frame = start + cnt;
        }
-       
+
        rec_data_ready_map[src] = true;
-       
-       if (rec_data_ready_map.size() == _trackview->get_diskstream()->n_channels().n_audio()) {
+
+       if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) {
                this->update_rec_regions ();
                rec_data_ready_map.clear();
        }
@@ -647,11 +652,10 @@ AudioStreamView::update_rec_regions ()
        if (use_rec_regions) {
                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;
+               for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin();
+                               iter != rec_regions.end(); n++) {
 
-                       tmp = iter;
+                       list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
                        ++tmp;
 
                        if (!canvas_item_visible (rec_rects[n].rectangle)) {
@@ -659,9 +663,10 @@ AudioStreamView::update_rec_regions ()
                                iter = tmp;
                                continue;
                        }
-                       
+
                        boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
                        if (!region) {
+                               iter = tmp;
                                continue;
                        }
 
@@ -676,7 +681,7 @@ AudioStreamView::update_rec_regions ()
                                        if (nlen != region->length()) {
 
                                                region->freeze ();
-                                               region->set_position (_trackview->get_diskstream()->get_capture_start_frame(n), this);
+                                               region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
                                                region->set_length (nlen, this);
                                                region->thaw ("updated");
 
@@ -687,29 +692,29 @@ AudioStreamView::update_rec_regions ()
 
                                                /* also update rect */
                                                ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
-                                               gdouble xend = _trackview->editor().frame_to_pixel (region->position() + region->length());
+                                               gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
                                                rect->property_x2() = xend;
                                        }
                                }
 
                        } else {
 
-                               nframes_t nlen = _trackview->get_diskstream()->get_captured_frames(n);
+                               nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
 
                                if (nlen != region->length()) {
 
                                        if (region->source_length(0) >= region->start() + nlen) {
 
                                                region->freeze ();
-                                               region->set_position (_trackview->get_diskstream()->get_capture_start_frame(n), this);
+                                               region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
                                                region->set_length (nlen, this);
                                                region->thaw ("updated");
-                                               
+
                                                if (origlen == 1) {
                                                        /* our special initial length */
                                                        add_region_view_internal (region, false, true);
                                                }
-                                               
+
                                                /* also hide rect */
                                                ArdourCanvas::Item * rect = rec_rects[n].rectangle;
                                                rect->hide();
@@ -762,9 +767,9 @@ AudioStreamView::hide_all_xfades ()
 void
 AudioStreamView::hide_xfades_involving (AudioRegionView& rv)
 {
-       for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if ((*i)->crossfade->involves (rv.audio_region())) {
-                       (*i)->fake_hide ();
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               if (i->second->crossfade->involves (rv.audio_region())) {
+                       i->second->fake_hide ();
                }
        }
 }
@@ -772,9 +777,9 @@ AudioStreamView::hide_xfades_involving (AudioRegionView& rv)
 void
 AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
 {
-       for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible() && _layer_display != Stacked) {
-                       (*i)->show ();
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               if (i->second->crossfade->involves (rv.audio_region()) && i->second->visible()) {
+                       i->second->show ();
                }
        }
 }
@@ -783,13 +788,13 @@ void
 AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
-       if (_trackview->is_track()) {
+       if (_trackview.is_track()) {
                canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get();
-       } 
+       }
 
        //case cAudioBusBase:
-       if (!_trackview->is_track()) {
-               if (Profile->get_sae() && _trackview->route()->is_master()) {
+       if (!_trackview.is_track()) {
+               if (Profile->get_sae() && _trackview.route()->is_master()) {
                        canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioMasterBusBase.get();
                } else {
                        canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get();
@@ -801,14 +806,35 @@ void
 AudioStreamView::update_contents_height ()
 {
        StreamView::update_contents_height ();
-       
+
        for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if (_layer_display == Overlaid) {
-                       (*i)->show ();
-                       (*i)->set_height (height);
-               } else {
-                       (*i)->hide ();
-               }
+               update_content_height (i->second);
+       }
+}
+
+void
+AudioStreamView::update_content_height (CrossfadeView* cv)
+{
+       cv->show ();
+
+       if (_layer_display == Overlaid) {
+
+               cv->set_y (0);
+               cv->set_height (height);
+
+       } else {
+
+               layer_t const inl = cv->crossfade->in()->layer ();
+               layer_t const outl = cv->crossfade->out()->layer ();
+
+               layer_t const high = max (inl, outl);
+               layer_t const low = min (inl, outl);
+
+               const double h = child_height ();
+
+               cv->set_y ((_layers - high - 1) * h);
+               cv->set_height ((high - low + 1) * h);
+
        }
 }