smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

Make butler handle auditioner again. Fixes #3128.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7100 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-13 19:35:35 +00:00
parent ec01a25ec1
commit 1f196b4013
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/butler.cc
View file

@ -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;
}