diff options
| author | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
| commit | 82232f06ba3eea4a2b4342ad91fab552f4044402 (patch) | |
| tree | d517cb47c017f51e2ecd9450624b86eb70d9f97b /gtk2_ardour/tape_region_view.cc | |
| parent | 25d1670a61d19e795227b939a98be9cf5a050c67 (diff) | |
Merged with trunk R861
Possible new bugs - not very thoroughly tested, but at least functional at first glance
git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/tape_region_view.cc')
| -rw-r--r-- | gtk2_ardour/tape_region_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 4110ad7d98..e697afddb9 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -50,12 +50,12 @@ const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility TimeAxisViewItem::FullWidthNameHighlight); TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, - AudioRegion& r, + boost::shared_ptr<AudioRegion> r, double spu, Gdk::Color& basic_color) : AudioRegionView (parent, tv, r, spu, basic_color, - TimeAxisViewItem::Visibility ((r.position() != 0) ? default_tape_visibility : + TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility : TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft))) { } @@ -67,8 +67,8 @@ TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw) /* every time the wave data changes and peaks are ready, redraw */ - for (uint32_t n = 0; n < audio_region().n_channels(); ++n) { - audio_region().audio_source(n).PeaksReady.connect (bind (mem_fun(*this, &TapeAudioRegionView::update), n)); + for (uint32_t n = 0; n < audio_region()->n_channels(); ++n) { + audio_region()->audio_source(n)->PeaksReady.connect (bind (mem_fun(*this, &TapeAudioRegionView::update), n)); } } @@ -90,7 +90,7 @@ TapeAudioRegionView::update (uint32_t n) /* this triggers a cache invalidation and redraw in the waveview */ - waves[n]->property_data_src() = &_region; + waves[n]->property_data_src() = _region.get(); } void |