add VU and IEC meter DSP (from jmeters)
[ardour.git] / gtk2_ardour / audio_streamview.cc
index a432f918740322c02acf95646970c4c3f719606f..088eec17e5b7bb39fd42c5ac4584ff070a3f5f28 100644 (file)
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
-#include "ardour/source.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
+#include "canvas/rectangle.h"
+
 #include "audio_streamview.h"
 #include "audio_region_view.h"
 #include "tape_region_view.h"
 #include "audio_time_axis.h"
-#include "canvas-waveview.h"
-#include "canvas-simplerect.h"
 #include "region_selection.h"
 #include "selection.h"
 #include "public_editor.h"
 #include "ardour_ui.h"
-#include "crossfade_view.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
@@ -62,29 +58,8 @@ using namespace Editing;
 AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
        : StreamView (tv)
 {
-       crossfades_visible = true;
        color_handler ();
        _amplitude_above_axis = 1.0;
-
-       use_rec_regions = tv.editor().show_waveforms_recording ();
-
-       Config->ParameterChanged.connect (*this, ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context());
-}
-
-AudioStreamView::~AudioStreamView ()
-{
-}
-
-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->second->set_samples_per_unit (spp);
-       }
-
-       return 0;
 }
 
 int
@@ -122,17 +97,20 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
        case NonLayered:
        case Normal:
                if (recording) {
-                       region_view = new AudioRegionView (canvas_group, _trackview, region,
-                                       _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
-                                                       TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight));
+                       region_view = new AudioRegionView (_canvas_group, _trackview, region,
+                                                          _samples_per_pixel, region_color, recording, TimeAxisViewItem::Visibility(
+                                                                  TimeAxisViewItem::ShowFrame |
+                                                                  TimeAxisViewItem::HideFrameRight |
+                                                                  TimeAxisViewItem::HideFrameLeft |
+                                                                  TimeAxisViewItem::HideFrameTB));
                } else {
-                       region_view = new AudioRegionView (canvas_group, _trackview, region,
-                                       _samples_per_unit, region_color);
+                       region_view = new AudioRegionView (_canvas_group, _trackview, region,
+                                       _samples_per_pixel, region_color);
                }
                break;
        case Destructive:
-               region_view = new TapeAudioRegionView (canvas_group, _trackview, region,
-                               _samples_per_unit, region_color);
+               region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
+                               _samples_per_pixel, region_color);
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg;
@@ -152,10 +130,6 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                region_view->set_sensitive (false);
        }
 
-       region_view->set_waveform_scale (Config->get_waveform_scale ());
-       region_view->set_waveform_shape (Config->get_waveform_shape ());
-       region_view->set_waveform_visible (Config->get_show_waveforms ());
-
        return region_view;
 }
 
@@ -163,6 +137,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;
        }
@@ -190,9 +165,15 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 
        region_views.push_front (region_view);
 
+        if (_trackview.editor().internal_editing()) {
+                region_view->hide_rect ();
+        } else {
+                region_view->show_rect ();
+        }
+
        /* catch region going away */
 
-       r->DropReferences.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
+       r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
 
        RegionViewAdded (region_view);
 
@@ -200,162 +181,9 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 }
 
 void
-AudioStreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
-{
-       ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_region_view, weak_r);
-
-       boost::shared_ptr<Region> r (weak_r.lock());
-
-       if (!r) {
-               return;
-       }
-
-       if (!_trackview.session()->deletion_in_progress()) {
-
-               for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end();) {
-                       CrossfadeViewList::iterator tmp;
-
-                       tmp = i;
-                       ++tmp;
-
-                       boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
-                       if (ar && i->second->crossfade->involves (ar)) {
-                               delete i->second;
-                               crossfade_views.erase (i);
-                       }
-
-                       i = tmp;
-               }
-       }
-
-       StreamView::remove_region_view(r);
-}
-
-void
-AudioStreamView::undisplay_diskstream ()
-{
-       StreamView::undisplay_diskstream();
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               delete i->second;
-       }
-
-       crossfade_views.clear ();
-}
-
-void
-AudioStreamView::playlist_layered (boost::weak_ptr<Diskstream> wds)
-{
-       boost::shared_ptr<Diskstream> ds (wds.lock());
-
-       if (!ds) {
-               return;
-       }
-
-       StreamView::playlist_layered (wds);
-
-       /* make sure xfades are on top and all the regionviews are stacked correctly. */
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               i->second->get_canvas_group()->raise_to_top();
-       }
-}
-
-void
-AudioStreamView::playlist_switched (boost::weak_ptr<Diskstream> wds)
-{
-       boost::shared_ptr<Diskstream> ds (wds.lock());
-
-       if (!ds) {
-               return;
-       }
-
-       playlist_connections.drop_connections ();
-
-       StreamView::playlist_switched (ds);
-
-       boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(ds->playlist());
-
-       if (apl) {
-               apl->NewCrossfade.connect (playlist_connections, ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context());
-       }
-}
-
-void
-AudioStreamView::add_crossfade (boost::weak_ptr<Crossfade> wc)
-{
-       boost::shared_ptr<Crossfade> crossfade (wc.lock());
-
-       if (!crossfade) {
-               return;
-       }
-
-       AudioRegionView* lview = 0;
-       AudioRegionView* rview = 0;
-
-       /* first see if we already have a CrossfadeView for this Crossfade */
-
-       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 */
-
-       for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
-
-               if (!lview && arv && (arv->region() == crossfade->out())) {
-                       lview = arv;
-               }
-               if (!rview && arv && (arv->region() == crossfade->in())) {
-                       rview = arv;
-               }
-       }
-
-       CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display (),
-                                              _trackview,
-                                               crossfade,
-                                              _samples_per_unit,
-                                              region_color,
-                                              *lview, *rview);
-       cv->set_valid (true);
-       crossfade->Invalidated.connect (*this, ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context());
-       crossfade_views[cv->crossfade] = cv;
-       if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) {
-               cv->hide ();
-       }
-
-       update_content_height (cv);
-}
-
-void
-AudioStreamView::remove_crossfade (boost::shared_ptr<Region> r)
-{
-       ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_crossfade, r)
-
-       boost::shared_ptr<Crossfade> xfade = boost::dynamic_pointer_cast<Crossfade> (r);
-
-       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;
-               }
-       }
-}
-
-void
-AudioStreamView::redisplay_diskstream ()
+AudioStreamView::redisplay_track ()
 {
        list<RegionView *>::iterator i;
-       CrossfadeViewList::iterator xi, tmpx;
 
        // Flag region views as invalid and disable drawing
        for (i = region_views.begin(); i != region_views.end(); ++i) {
@@ -363,79 +191,17 @@ AudioStreamView::redisplay_diskstream ()
                (*i)->enable_display (false);
        }
 
-       // Flag crossfade views as invalid
-       for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               xi->second->set_valid (false);
-               if (xi->second->visible()) {
-                       xi->second->show ();
-               }
-       }
-
-       // Add and display region and crossfade views, and flag them as valid
-
+       // Add and display views, and flag them as valid
        if (_trackview.is_audio_track()) {
-               _trackview.get_diskstream()->playlist()->foreach_region(
+               _trackview.track()->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()
-                       );
-
-               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->second->valid()) {
-                       delete xi->second;
-                       crossfade_views.erase (xi);
-               }
-
-               xi = tmpx;
        }
 
        // Stack regions by layer, and remove invalid regions
        layer_regions();
 }
 
-void
-AudioStreamView::set_show_waveforms (bool yn)
-{
-       for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       arv->set_waveform_visible (yn);
-               }
-       }
-}
-
-void
-AudioStreamView::set_waveform_shape (WaveformShape shape)
-{
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv)
-                       arv->set_waveform_shape (shape);
-       }
-}
-
-void
-AudioStreamView::set_waveform_scale (WaveformScale scale)
-{
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       arv->set_waveform_scale (scale);
-               }
-       }
-}
-
 void
 AudioStreamView::setup_rec_box ()
 {
@@ -447,36 +213,37 @@ AudioStreamView::setup_rec_box ()
 
                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()) {
+                   _trackview.track()->record_enabled()) {
+                       if (_trackview.audio_track()->mode() == Normal && Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
-                               /* add a new region, but don't bother if they set use_rec_regions mid-record */
+                               /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
 
                                SourceList sources;
 
                                rec_data_ready_connections.drop_connections ();
-                               boost::shared_ptr<AudioDiskstream> ads = _trackview.audio_track()->audio_diskstream();
+                               boost::shared_ptr<AudioTrack> tr = _trackview.audio_track();
 
-                               for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) {
-                                       boost::shared_ptr<AudioFileSource> src = ads->write_source (n);
+                               for (uint32_t n = 0; n < tr->n_channels().n_audio(); ++n) {
+                                       boost::shared_ptr<AudioFileSource> src = tr->write_source (n);
                                        if (src) {
                                                sources.push_back (src);
                                                src->PeakRangeReady.connect (rec_data_ready_connections,
-                                                                            ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
-                                                                            gui_context());
+                                                                            invalidator (*this),
+                                                                            boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
+                                                                            gui_context());
                                        }
                                }
 
                                // handle multi
 
-                               nframes_t start = 0;
+                               framepos_t start = 0;
                                if (rec_regions.size() > 0) {
                                        start = rec_regions.back().first->start()
-                                                       + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
+                                                       + _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());
@@ -486,9 +253,8 @@ AudioStreamView::setup_rec_box ()
                                        boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
 
                                assert(region);
-                               region->block_property_changes ();
-                               region->set_position (_trackview.session()->transport_frame(), this);
-                               rec_regions.push_back (make_pair(region, (RegionView*)0));
+                               region->set_position (_trackview.session()->transport_frame());
+                               rec_regions.push_back (make_pair(region, (RegionView*) 0));
                        }
 
                        /* start a new rec box */
@@ -496,9 +262,8 @@ AudioStreamView::setup_rec_box ()
                        boost::shared_ptr<AudioTrack> at;
 
                        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);
+                       framepos_t const frame_pos = at->current_capture_start ();
+                       gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos);
                        gdouble xend;
                        uint32_t fill_color;
 
@@ -506,12 +271,12 @@ AudioStreamView::setup_rec_box ()
                        case Normal:
                        case NonLayered:
                                xend = xstart;
-                               fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
                                break;
 
                        case Destructive:
                                xend = xstart + 2;
-                               fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
                                /* make the recording rect translucent to allow
                                   the user to see the peak data coming in, etc.
                                */
@@ -519,14 +284,14 @@ AudioStreamView::setup_rec_box ()
                                break;
                        }
 
-                       ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
-                       rec_rect->property_x1() = xstart;
-                       rec_rect->property_y1() = 1.0;
-                       rec_rect->property_x2() = xend;
-                       rec_rect->property_y2() = child_height ();
-                       rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
-                       rec_rect->property_outline_what() = 0x1 | 0x2 | 0x4 | 0x8;
-                       rec_rect->property_fill_color_rgba() = fill_color;
+                       ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
+                       rec_rect->set_x0 (xstart);
+                       rec_rect->set_y0 (1);
+                       rec_rect->set_x1 (xend);
+                       rec_rect->set_y1 (child_height ());
+                       rec_rect->set_outline_what (0);
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+                       rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();
 
                        RecBoxInfo recbox;
@@ -544,7 +309,7 @@ AudioStreamView::setup_rec_box ()
 
                } else if (rec_active &&
                           (_trackview.session()->record_status() != Session::Recording ||
-                           !_trackview.get_diskstream()->record_enabled())) {
+                           !_trackview.track()->record_enabled())) {
                        screen_update_connection.disconnect();
                        rec_active = false;
                        rec_updating = false;
@@ -592,15 +357,7 @@ AudioStreamView::setup_rec_box ()
 }
 
 void
-AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void))
-{
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               (i->second->*pmf) ();
-       }
-}
-
-void
-AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<Source> weak_src)
+AudioStreamView::rec_peak_range_ready (framepos_t start, framecnt_t cnt, boost::weak_ptr<Source> weak_src)
 {
        ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src)
 
@@ -618,74 +375,81 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we
 
        rec_data_ready_map[src] = true;
 
-       if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) {
-               this->update_rec_regions ();
+       if (rec_data_ready_map.size() == _trackview.track()->n_channels().n_audio()) {
+               update_rec_regions (start, cnt);
                rec_data_ready_map.clear();
        }
 }
 
 void
-AudioStreamView::update_rec_regions ()
+AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
 {
-       if (use_rec_regions) {
-               uint32_t n = 0;
+       if (!Config->get_show_waveforms_while_recording ()) {
+               return;
+       }
 
-               for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin();
-                               iter != rec_regions.end(); n++) {
+       uint32_t n = 0;
 
-                       list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
-                       ++tmp;
+       for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
 
-                       if (!canvas_item_visible (rec_rects[n].rectangle)) {
-                               /* rect already hidden, this region is done */
-                               iter = tmp;
-                               continue;
-                       }
+               list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
+               ++tmp;
 
-                       boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
-                       if (!region) {
-                               iter = tmp;
-                               continue;
-                       }
+               assert (n < rec_rects.size());
 
-                       nframes_t origlen = region->length();
+               if (!rec_rects[n].rectangle->visible()) {
+                       /* rect already hidden, this region is done */
+                       iter = tmp;
+                       continue;
+               }
 
-                       if (region == rec_regions.back().first && rec_active) {
+               boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
 
-                               if (last_rec_data_frame > region->start()) {
+               if (!region) {
+                       iter = tmp;
+                       continue;
+               }
 
-                                       nframes_t nlen = last_rec_data_frame - region->start();
+               framecnt_t origlen = region->length();
 
-                                       if (nlen != region->length()) {
+               if (region == rec_regions.back().first && rec_active) {
 
-                                               region->suspend_property_changes ();
-                                               region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
-                                               region->set_length (nlen, this);
-                                               region->resume_property_changes ();
+                       if (last_rec_data_frame > region->start()) {
 
-                                               if (origlen == 1) {
-                                                       /* our special initial length */
-                                                       add_region_view_internal (region, false, true);
-                                               }
+                               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));
+                                       region->set_length (nlen);
+                                       region->resume_property_changes ();
 
-                                               /* also update rect */
-                                               ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
-                                               gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
-                                               rect->property_x2() = xend;
+                                       if (origlen == 1) {
+                                               /* our special initial length */
+                                               add_region_view_internal (region, false, true);
+                                               setup_new_rec_layer_time (region);
                                        }
+
+                                       check_record_layers (region, (region->position() - region->start() + start + cnt));
+
+                                       /* also update rect */
+                                       ArdourCanvas::Rectangle * rect = rec_rects[n].rectangle;
+                                       gdouble xend = _trackview.editor().sample_to_pixel (region->position() + region->length());
+                                       rect->set_x1 (xend);
                                }
 
                        } else {
 
-                               nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
+                               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.get_diskstream()->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) {
@@ -700,9 +464,9 @@ AudioStreamView::update_rec_regions ()
                                        }
                                }
                        }
-
-                       iter = tmp;
                }
+
+               iter = tmp;
        }
 }
 
@@ -728,38 +492,36 @@ AudioStreamView::hide_all_fades ()
        }
 }
 
-void
-AudioStreamView::show_all_xfades ()
-{
-       foreach_crossfadeview (&CrossfadeView::show);
-       crossfades_visible = true;
-}
-
-void
-AudioStreamView::hide_all_xfades ()
-{
-       foreach_crossfadeview (&CrossfadeView::hide);
-       crossfades_visible = false;
-}
-
-void
-AudioStreamView::hide_xfades_involving (AudioRegionView& rv)
+/** Hide xfades for regions that overlap ar.
+ *  @return Pair of lists; first is the AudioRegionViews that start xfades were hidden for,
+ *  second is the AudioRegionViews that end xfades were hidden for.
+ */
+pair<list<AudioRegionView*>, list<AudioRegionView*> >
+AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
 {
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if (i->second->crossfade->involves (rv.audio_region())) {
-                       i->second->fake_hide ();
+       list<AudioRegionView*> start_hidden;
+       list<AudioRegionView*> end_hidden;
+       
+       for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
+               if (arv) {
+                       switch (arv->region()->coverage (ar->position(), ar->last_frame())) {
+                       case Evoral::OverlapNone:
+                               break;
+                       default:
+                               if (arv->start_xfade_visible ()) {
+                                       start_hidden.push_back (arv);
+                               }
+                               if (arv->end_xfade_visible ()) {
+                                       end_hidden.push_back (arv);
+                               }
+                               arv->hide_xfades ();
+                               break;
+                       }
                }
        }
-}
 
-void
-AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
-{
-       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 ();
-               }
-       }
+       return make_pair (start_hidden, end_hidden);
 }
 
 void
@@ -767,63 +529,15 @@ AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
        if (_trackview.is_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get();
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioTrackBase());
        }
 
        //case cAudioBusBase:
        if (!_trackview.is_track()) {
                if (Profile->get_sae() && _trackview.route()->is_master()) {
-                       canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioMasterBusBase.get();
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioMasterBusBase());
                } else {
-                       canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get();
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioBusBase());
                }
        }
 }
-
-void
-AudioStreamView::update_contents_height ()
-{
-       StreamView::update_contents_height ();
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               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);
-
-       }
-}
-
-void
-AudioStreamView::parameter_changed (string const & p)
-{
-       if (p == "show-waveforms") {
-               set_show_waveforms (Config->get_show_waveforms ());
-       } else if (p == "waveform-scale") {
-               set_waveform_scale (Config->get_waveform_scale ());
-       } else if (p == "waveform-shape") {
-               set_waveform_shape (Config->get_waveform_shape ());
-       }
-}