diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-16 20:57:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-16 20:57:24 +0000 |
| commit | fe7c3976c9382bb9f19797034dece570eefcbf01 (patch) | |
| tree | 299bb20275adc33f1090f1620af8817867d3af15 /gtk2_ardour/audio_streamview.cc | |
| parent | 626775f128bf072f6293474508be3448c113906c (diff) | |
fix (?) handling of fake regions; use int cast before MeterFoo cast; use default values for MeterFoo switch table conversions
git-svn-id: svn://localhost/ardour2/trunk@987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index c24d393f53..97505d90f0 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -126,7 +126,7 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) } void -AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves) +AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool watch_death) { AudioRegionView *region_view; @@ -167,9 +167,10 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai 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<Region> (r))); + if (watch_death) { + /* catch regionview going away */ + region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr<Region> (r))); + } RegionViewAdded (region_view); } @@ -604,7 +605,7 @@ AudioStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + add_region_view_internal (region, false, false); } /* also update rect */ @@ -629,7 +630,7 @@ AudioStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + add_region_view_internal (region, false, false); } /* also hide rect */ |