diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-13 19:35:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-13 19:35:35 +0000 |
| commit | 1f196b40138d779d87a02d2f10e0cefe9a454fd1 (patch) | |
| tree | 5c462578f5554e2780b72f068dd22df8e0789d36 /libs/ardour/butler.cc | |
| parent | ec01a25ec1dfefbd6918801a354fde024a94a586 (diff) | |
Make butler handle auditioner again. Fixes #3128.
git-svn-id: svn://localhost/ardour2/branches/3.0@7100 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/butler.cc')
| -rw-r--r-- | libs/ardour/butler.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 35fb6bcc03..9847d55e40 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -29,6 +29,7 @@ #include "ardour/midi_diskstream.h" #include "ardour/session.h" #include "ardour/track.h" +#include "ardour/auditioner.h" #include "i18n.h" @@ -210,11 +211,14 @@ Butler::thread_work () boost::shared_ptr<RouteList> rl = _session.get_routes(); + RouteList rl_with_auditioner = *rl; + rl_with_auditioner.push_back (_session.the_auditioner()); + // for (i = dsl->begin(); i != dsl->end(); ++i) { // cerr << "BEFORE " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl; // } - for (i = rl->begin(); !transport_work_requested() && should_run && i != rl->end(); ++i) { + for (i = rl_with_auditioner.begin(); !transport_work_requested() && should_run && i != rl_with_auditioner.end(); ++i) { boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i); if (!tr) { @@ -246,7 +250,7 @@ Butler::thread_work () } - if (i != rl->begin() && i != rl->end()) { + if (i != rl_with_auditioner.begin() && i != rl_with_auditioner.end()) { /* we didn't get to all the streams */ disk_work_outstanding = true; } |