diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
| commit | 061a85191c301ac18f2e8ca59d43127a4499ba96 (patch) | |
| tree | 469688f4dea1853c91372319a899b2efc71b30d5 /gtk2_ardour/audio_region_view.cc | |
| parent | d9cebc2edf8accded23c6f2a1caab73eb47a50fd (diff) | |
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again.
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 13e21b9a63..394751b88c 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -27,7 +27,6 @@ #include "ardour/playlist.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" -#include "ardour/audio_diskstream.h" #include "ardour/profile.h" #include "ardour/session.h" @@ -847,11 +846,11 @@ AudioRegionView::create_waves () // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick - if (!atv.get_diskstream()) { + if (!atv.track()) { return; } - ChanCount nchans = atv.get_diskstream()->n_channels(); + ChanCount nchans = atv.track()->n_channels(); // cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data // << " and channels = " << nchans.n_audio() << endl; @@ -894,7 +893,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) { //cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick - uint32_t nchans = atv.get_diskstream()->n_channels().n_audio(); + uint32_t nchans = atv.track()->n_channels().n_audio(); uint32_t n; uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); gdouble ht; @@ -1163,7 +1162,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv) AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position); uint32_t nchans; - nchans = rtv->get_diskstream()->n_channels().n_audio(); + nchans = rtv->track()->n_channels().n_audio(); for (uint32_t n = 0; n < nchans; ++n) { |