X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=14036bc569c3603e23f537a95491ae2cb6239bdd;hb=767984b486086e3682e521179c2fb8364b3bba76;hp=222c920709c7cfdf7e44986cac47e19eae25640b;hpb=0d0f71ee92fb7ce53fbcb8c7b0cd93b1cdf3529f;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 222c920709..14036bc569 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -48,6 +48,8 @@ #include "utils.h" #include "color.h" +#include "i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -56,7 +58,9 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) : StreamView (tv) { crossfades_visible = true; - + _waveform_scale = LinearWaveform; + _waveform_shape = Traditional; + if (tv.is_audio_track()) stream_base_color = color_map[cAudioTrackBase]; else @@ -128,7 +132,7 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) void AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves) { - AudioRegionView *region_view; + AudioRegionView *region_view = 0; ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r)); @@ -144,6 +148,14 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai /* 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); + } + return; } } @@ -157,18 +169,51 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai region_view = new TapeAudioRegionView (canvas_group, _trackview, region, _samples_per_unit, region_color); break; + default: + fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg; + /*NOTREACHED*/ + } region_view->init (region_color, wait_for_waves); region_view->set_amplitude_above_axis(_amplitude_above_axis); region_views.push_front (region_view); + + + /* if its the special single-sample length that we use for rec-regions, make it + insensitive to events + */ + + if (region->length() == 1) { + region_view->set_sensitive (false); + } + + /* if this was the first one, then lets query the waveform scale and shape. + otherwise, we set it to the current value */ + + if (region_views.size() == 1) { + if (region_view->waveform_logscaled()) { + _waveform_scale = LogWaveform; + } else { + _waveform_scale = LinearWaveform; + } + + if (region_view->waveform_rectified()) { + _waveform_shape = Rectified; + } else { + _waveform_shape = Traditional; + } + } + else { + region_view->set_waveform_scale(_waveform_scale); + region_view->set_waveform_shape(_waveform_shape); + } /* follow global waveform setting */ region_view->set_waveform_visible(_trackview.editor.show_waveforms()); /* catch regionview going away */ - region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr (r))); RegionViewAdded (region_view); @@ -185,21 +230,25 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) return; } - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { - list::iterator tmp; - - tmp = i; - ++tmp; - - boost::shared_ptr ar = boost::dynamic_pointer_cast(r); - if (ar && (*i)->crossfade.involves (ar)) { - delete *i; - crossfade_views.erase (i); + if (!_trackview.session().deletion_in_progress()) { + + for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { + list::iterator tmp; + + tmp = i; + ++tmp; + + boost::shared_ptr ar = boost::dynamic_pointer_cast(r); + if (ar && (*i)->crossfade->involves (ar)) { + delete *i; + crossfade_views.erase (i); + } + + i = tmp; } - - i = tmp; } + StreamView::remove_region_view(r); } @@ -236,23 +285,23 @@ AudioStreamView::playlist_changed (boost::shared_ptr ds) StreamView::playlist_changed(ds); - AudioPlaylist* apl = dynamic_cast(ds->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))); } void -AudioStreamView::add_crossfade (Crossfade *crossfade) +AudioStreamView::add_crossfade (boost::shared_ptr crossfade) { AudioRegionView* lview = 0; AudioRegionView* rview = 0; - + ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade), crossfade)); /* first see if we already have a CrossfadeView for this Crossfade */ for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if (&(*i)->crossfade == crossfade) { + if ((*i)->crossfade == crossfade) { if (!crossfades_visible) { (*i)->hide(); } else { @@ -278,7 +327,7 @@ AudioStreamView::add_crossfade (Crossfade *crossfade) CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display, _trackview, - *crossfade, + crossfade, _samples_per_unit, region_color, *lview, *rview); @@ -286,18 +335,18 @@ AudioStreamView::add_crossfade (Crossfade *crossfade) crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); crossfade_views.push_back (cv); - if (!crossfades_visible) { + if (!Config->get_xfades_visible() || !crossfades_visible) { cv->hide (); } } void -AudioStreamView::remove_crossfade (Crossfade *xfade) +AudioStreamView::remove_crossfade (boost::shared_ptr xfade) { ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), xfade)); for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if (&(*i)->crossfade == xfade) { + if ((*i)->crossfade == xfade) { delete *i; crossfade_views.erase (i); break; @@ -311,7 +360,6 @@ AudioStreamView::redisplay_diskstream () list::iterator i, tmp; list::iterator xi, tmpx; - for (i = region_views.begin(); i != region_views.end(); ++i) { (*i)->set_valid (false); } @@ -325,7 +373,8 @@ AudioStreamView::redisplay_diskstream () if (_trackview.is_audio_track()) { _trackview.get_diskstream()->playlist()->foreach_region (static_cast(this), &StreamView::add_region_view); - AudioPlaylist* apl = dynamic_cast(_trackview.get_diskstream()->playlist()); + + boost::shared_ptr apl = boost::dynamic_pointer_cast(_trackview.get_diskstream()->playlist()); if (apl) apl->foreach_crossfade (this, &AudioStreamView::add_crossfade); } @@ -356,7 +405,9 @@ AudioStreamView::redisplay_diskstream () /* now fix layering */ - playlist_modified (); + for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { + region_layered (*i); + } } void @@ -377,8 +428,20 @@ AudioStreamView::set_waveform_shape (WaveformShape shape) if (arv) arv->set_waveform_shape (shape); } + _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(*i); + if (arv) + arv->set_waveform_scale (scale); + } + _waveform_scale = scale; +} + void AudioStreamView::setup_rec_box () { @@ -506,8 +569,15 @@ AudioStreamView::setup_rec_box () /* remove temp regions */ - for (list >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ++iter) { + for (list >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { + list >::iterator tmp; + + tmp = iter; + ++tmp; + (*iter)->drop_references (); + + iter = tmp; } rec_regions.clear(); @@ -660,7 +730,7 @@ void AudioStreamView::hide_xfades_involving (AudioRegionView& rv) { for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade.involves (rv.audio_region())) { + if ((*i)->crossfade->involves (rv.audio_region())) { (*i)->fake_hide (); } } @@ -670,7 +740,7 @@ void AudioStreamView::reveal_xfades_involving (AudioRegionView& rv) { for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade.involves (rv.audio_region()) && (*i)->visible()) { + if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible()) { (*i)->show (); } }