From 0569107ddc0d2a8df6ca0a2c8cc16ebe8f3dee99 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 13 May 2009 21:34:09 +0000 Subject: more work on the new all-Processor-all-The-Time redesign of Route - LOTS OF BREAKAGE STILL EXPECTED ; change all(?) methods that pass a start/end frame in to use sframes_t not nframes_t git-svn-id: svn://localhost/ardour2/branches/3.0@5074 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_streamview.cc | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'gtk2_ardour/audio_streamview.cc') diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 8dcee5aaab..772b455f97 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -108,30 +108,32 @@ RegionView* AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) { AudioRegionView *region_view = 0; - boost::shared_ptr region = boost::dynamic_pointer_cast (r); if (region == 0) { return NULL; } - for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if ((*i)->region() == r) { - - /* great. we already have a AudioRegionView for this Region. use it again. */ - - (*i)->set_valid (true); - - // this might not be necessary - AudioRegionView* const arv = dynamic_cast(*i); - if (arv) { - arv->set_waveform_scale (_waveform_scale); - arv->set_waveform_shape (_waveform_shape); - } +// if(!recording){ +// for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { +// 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. */ - return NULL; - } - } +// (*i)->set_valid (true); + + // this might not be necessary +// AudioRegionView* const arv = dynamic_cast(*i); + +// if (arv) { +// arv->set_waveform_scale (_waveform_scale); +// arv->set_waveform_shape (_waveform_shape); +// } + +// return NULL; +// } +// } +// } switch (_trackview.audio_track()->mode()) { @@ -173,6 +175,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai otherwise, we set it to the current value */ if (region_views.size() == 1) { + if (region_view->waveform_logscaled()) { _waveform_scale = LogWaveform; } else { @@ -191,7 +194,6 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai } /* follow global waveform setting */ - region_view->set_waveform_visible(_trackview.editor().show_waveforms()); /* catch regionview going away */ @@ -396,6 +398,7 @@ 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( static_cast(this), -- cgit v1.2.3