X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=abfa767c9c473dfeec247de7b435e51840d52806;hb=7b155267505af3fedffc7972b08cb784c97b7e74;hp=901828bb4e97af123977701878fe0ef374d6a3a0;hpb=8934ff78678cafeb03c398e7add299f2bc1a730d;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 901828bb4e..abfa767c9c 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -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 @@ -24,14 +24,17 @@ #include +#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 "audio_streamview.h" #include "audio_region_view.h" @@ -58,20 +61,18 @@ using namespace Editing; AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) : StreamView (tv) { - crossfades_visible = true; + crossfades_visible = tv.session()->config.get_xfades_visible (); color_handler (); _amplitude_above_axis = 1.0; - use_rec_regions = tv.editor().show_waveforms_recording (); - - Config->ParameterChanged.connect (sigc::mem_fun (*this, &AudioStreamView::parameter_changed)); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context()); } AudioStreamView::~AudioStreamView () { } -int +int AudioStreamView::set_samples_per_unit (gdouble spp) { StreamView::set_samples_per_unit(spp); @@ -83,7 +84,7 @@ AudioStreamView::set_samples_per_unit (gdouble spp) return 0; } -int +int AudioStreamView::set_amplitude_above_axis (gdouble app) { RegionViewList::iterator i; @@ -114,20 +115,23 @@ AudioStreamView::create_region_view (boost::shared_ptr r, bool wait_for_ } 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)); + TimeAxisViewItem::ShowFrame | + TimeAxisViewItem::HideFrameRight | + TimeAxisViewItem::HideFrameLeft | + TimeAxisViewItem::HideFrameTB)); } 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 +144,8 @@ AudioStreamView::create_region_view (boost::shared_ptr 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,13 +156,14 @@ AudioStreamView::create_region_view (boost::shared_ptr 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* AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) { RegionView *region_view = create_region_view (r, wait_for_waves, recording); + if (region_view == 0) { return 0; } @@ -168,7 +173,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr 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 +183,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai // arv->set_waveform_scale (_waveform_scale); // arv->set_waveform_shape (_waveform_shape); // } - + // return NULL; // } // } @@ -186,8 +191,9 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai region_views.push_front (region_view); - /* catch regionview going away */ - r->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr (r))); + /* catch region going away */ + + r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); RegionViewAdded (region_view); @@ -197,7 +203,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai void AudioStreamView::remove_region_view (boost::weak_ptr weak_r) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_region_view), weak_r)); + ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_region_view, weak_r); boost::shared_ptr r (weak_r.lock()); @@ -205,20 +211,20 @@ AudioStreamView::remove_region_view (boost::weak_ptr 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; - + tmp = i; ++tmp; - + boost::shared_ptr ar = boost::dynamic_pointer_cast(r); if (ar && i->second->crossfade->involves (ar)) { delete i->second; crossfade_views.erase (i); } - + i = tmp; } } @@ -227,9 +233,9 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) } void -AudioStreamView::undisplay_diskstream () +AudioStreamView::undisplay_track () { - StreamView::undisplay_diskstream(); + StreamView::undisplay_track (); for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { delete i->second; @@ -239,22 +245,16 @@ AudioStreamView::undisplay_diskstream () } void -AudioStreamView::playlist_modified_weak (boost::weak_ptr ds) +AudioStreamView::playlist_layered (boost::weak_ptr wtr) { - boost::shared_ptr sp (ds.lock()); - if (sp) { - playlist_modified (sp); + boost::shared_ptr tr (wtr.lock()); + + if (!tr) { + return; } -} -void -AudioStreamView::playlist_modified (boost::shared_ptr ds) -{ - /* we do not allow shared_ptr to be bound to slots */ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_modified_weak), ds)); + StreamView::playlist_layered (wtr); - StreamView::playlist_modified (ds); - /* 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) { @@ -263,52 +263,37 @@ AudioStreamView::playlist_modified (boost::shared_ptr ds) } void -AudioStreamView::playlist_changed_weak (boost::weak_ptr ds) +AudioStreamView::playlist_switched (boost::weak_ptr wtr) { - boost::shared_ptr sp (ds.lock()); - if (sp) { - playlist_changed (sp); + boost::shared_ptr tr (wtr.lock()); + + if (!tr) { + return; } -} -void -AudioStreamView::playlist_changed (boost::shared_ptr ds) -{ - ENSURE_GUI_THREAD (bind ( - mem_fun (*this, &AudioStreamView::playlist_changed_weak), - boost::weak_ptr (ds))); + playlist_connections.drop_connections (); - StreamView::playlist_changed(ds); + StreamView::playlist_switched (tr); + + boost::shared_ptr apl = boost::dynamic_pointer_cast (tr->playlist()); - boost::shared_ptr apl = boost::dynamic_pointer_cast(ds->playlist()); if (apl) { - playlist_connections.push_back (apl->NewCrossfade.connect ( - mem_fun (*this, &AudioStreamView::add_crossfade))); + apl->NewCrossfade.connect (playlist_connections, invalidator (*this), ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context()); } } void -AudioStreamView::add_crossfade_weak (boost::weak_ptr crossfade) +AudioStreamView::add_crossfade (boost::weak_ptr wc) { - boost::shared_ptr sp (crossfade.lock()); + boost::shared_ptr crossfade (wc.lock()); - if (!sp) { + if (!crossfade) { return; } - add_crossfade (sp); -} - -void -AudioStreamView::add_crossfade (boost::shared_ptr crossfade) -{ AudioRegionView* lview = 0; AudioRegionView* rview = 0; - /* we do not allow shared_ptr to be bound to slots */ - - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade_weak), boost::weak_ptr (crossfade))); - /* first see if we already have a CrossfadeView for this Crossfade */ CrossfadeViewList::iterator i = crossfade_views.find (crossfade); @@ -342,9 +327,9 @@ AudioStreamView::add_crossfade (boost::shared_ptr crossfade) region_color, *lview, *rview); cv->set_valid (true); - crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); + crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context()); crossfade_views[cv->crossfade] = cv; - if (!_trackview.session().config.get_xfades_visible() || !crossfades_visible) { + if (!crossfades_visible) { cv->hide (); } @@ -354,7 +339,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr crossfade) void AudioStreamView::remove_crossfade (boost::shared_ptr r) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), r)); + ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_crossfade, r) boost::shared_ptr xfade = boost::dynamic_pointer_cast (r); @@ -368,7 +353,7 @@ AudioStreamView::remove_crossfade (boost::shared_ptr r) } void -AudioStreamView::redisplay_diskstream () +AudioStreamView::redisplay_track () { list::iterator i; CrossfadeViewList::iterator xi, tmpx; @@ -390,19 +375,19 @@ AudioStreamView::redisplay_diskstream () // Add and display region and crossfade 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 apl = boost::dynamic_pointer_cast( - _trackview.get_diskstream()->playlist() + _trackview.track()->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; @@ -439,7 +424,7 @@ AudioStreamView::set_waveform_shape (WaveformShape shape) if (arv) arv->set_waveform_shape (shape); } -} +} void AudioStreamView::set_waveform_scale (WaveformScale scale) @@ -450,67 +435,69 @@ 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; - 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.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; - for (list::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 ads = boost::dynamic_pointer_cast(_trackview.get_diskstream()); - assert(ads); + rec_data_ready_connections.drop_connections (); + boost::shared_ptr tr = _trackview.audio_track(); - for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) { - boost::shared_ptr src = boost::static_pointer_cast (ads->write_source (n)); + for (uint32_t n = 0; n < tr->n_channels().n_audio(); ++n) { + boost::shared_ptr src = tr->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(src)))); + src->PeakRangeReady.connect (rec_data_ready_connections, + invalidator (*this), + ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr(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); + start = rec_regions.back().first->start() + + _trackview.track()->get_captured_frames(rec_regions.size()-1); } + + PropertyList plist; - boost::shared_ptr region (boost::dynamic_pointer_cast - (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags), false))); + plist.add (Properties::start, start); + plist.add (Properties::length, 1); + plist.add (Properties::name, string()); + plist.add (Properties::layer, 0); + + boost::shared_ptr region ( + boost::dynamic_pointer_cast(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(), this); + rec_regions.push_back (make_pair(region, (RegionView*) 0)); } - + /* start a new rec box */ boost::shared_ptr at; at = _trackview.audio_track(); /* we know what it is already */ - boost::shared_ptr ds = at->audio_diskstream(); - nframes_t frame_pos = ds->current_capture_start (); + framepos_t const frame_pos = at->current_capture_start (); gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); gdouble xend; uint32_t fill_color; @@ -531,37 +518,38 @@ AudioStreamView::setup_rec_box () fill_color = UINT_RGBA_CHANGE_A (fill_color, 120); break; } - - ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group); + + 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_what() = 0x0; 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; 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 ( + sigc::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.track()->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; @@ -570,15 +558,10 @@ AudioStreamView::setup_rec_box () /* disconnect rapid update */ screen_update_connection.disconnect(); - - for (list::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) { - (*prc).disconnect(); - } - rec_data_ready_connections.clear(); - + rec_data_ready_connections.drop_connections (); rec_updating = false; rec_active = false; - + /* remove temp regions */ for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { @@ -591,7 +574,7 @@ AudioStreamView::setup_rec_box () iter = tmp; } - + rec_regions.clear(); // cerr << "\tclear " << rec_rects.size() << " rec rects\n"; @@ -601,9 +584,9 @@ AudioStreamView::setup_rec_box () RecBoxInfo &rect = (*iter); delete rect.rectangle; } - + rec_rects.clear(); - + } } } @@ -617,99 +600,106 @@ AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void)) } void -AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr weak_src) +AudioStreamView::rec_peak_range_ready (framepos_t start, framecnt_t cnt, boost::weak_ptr weak_src) { - ENSURE_GUI_THREAD(bind (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), start, cnt, weak_src)); - + ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src) + boost::shared_ptr 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()) { - 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; - - for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - - list,RegionView*> >::iterator tmp; + if (!Config->get_show_waveforms_while_recording ()) { + return; + } + + uint32_t n = 0; + + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { + + list,RegionView*> >::iterator tmp = iter; + ++tmp; - 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 region = boost::dynamic_pointer_cast(iter->first); + + if (!region) { + iter = tmp; + continue; + } + + framecnt_t origlen = region->length(); - if (!canvas_item_visible (rec_rects[n].rectangle)) { - /* rect already hidden, this region is done */ - iter = tmp; - continue; - } + if (region == rec_regions.back().first && rec_active) { - boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); - if (!region) { - continue; - } - - nframes_t origlen = region->length(); - - if (region == rec_regions.back().first && rec_active) { - - if (last_rec_data_frame > region->start()) { - - nframes_t nlen = last_rec_data_frame - region->start(); - - if (nlen != region->length()) { - - region->freeze (); - 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); - } + if (last_rec_data_frame > region->start()) { + + framecnt_t nlen = last_rec_data_frame - region->start(); + + if (nlen != region->length()) { - /* 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; + region->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n), this); + region->set_length (nlen, this); + region->resume_property_changes (); + + 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::SimpleRect * rect = rec_rects[n].rectangle; + 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); - + + framecnt_t nlen = _trackview.track()->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->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n), this); region->set_length (nlen, this); - region->thaw ("updated"); - + region->resume_property_changes (); + 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(); @@ -717,9 +707,9 @@ AudioStreamView::update_rec_regions () } } } - - iter = tmp; } + + iter = tmp; } } @@ -785,7 +775,7 @@ AudioStreamView::color_handler () //case cAudioTrackBase: if (_trackview.is_track()) { canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get(); - } + } //case cAudioBusBase: if (!_trackview.is_track()) { @@ -810,26 +800,24 @@ AudioStreamView::update_contents_height () 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); - + } } @@ -844,3 +832,14 @@ AudioStreamView::parameter_changed (string const & p) set_waveform_shape (Config->get_waveform_shape ()); } } + +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 (); + } +} +