diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-27 14:41:24 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-27 14:41:24 +0000 |
commit | 5e8b3f08328424299c264d70bba307dcea1f2b17 (patch) | |
tree | 488cc97ada729f0b4cf3d11f694aa00db7a87f69 /libs/ardour/auditioner.cc | |
parent | 4be50fc81bf5db91113c4e87f867163e738a0919 (diff) |
part one of hiding Diskstreams and making them a private object of a Track
git-svn-id: svn://localhost/ardour2/branches/3.0@6802 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/auditioner.cc')
-rw-r--r-- | libs/ardour/auditioner.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index d7df19a704..8b8f850f8b 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -199,7 +199,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region) int Auditioner::play_audition (nframes_t nframes) { - bool need_butler; + bool need_butler = false; nframes_t this_nframes; int ret; @@ -210,14 +210,11 @@ Auditioner::play_audition (nframes_t nframes) this_nframes = min (nframes, length - current_frame); - _diskstream->prepare (); - - if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) { + if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false, need_butler)) != 0) { silence (nframes); return ret; } - need_butler = _diskstream->commit (this_nframes); current_frame += this_nframes; if (current_frame >= length) { |