diff options
author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
tree | 84324a63b87c03589cd165b9e474296eaebb4772 /libs/ardour/session_butler.cc | |
parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_butler.cc')
-rw-r--r-- | libs/ardour/session_butler.cc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index afb284b0f4..148ff92739 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -233,10 +233,6 @@ Session::butler_thread_work () } } - //for (i = diskstreams.begin(); i != diskstreams.end(); ++i) { - // cerr << "BEFORE " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl; - //} - if (transport_work_requested()) { butler_transport_work (); } @@ -249,10 +245,23 @@ Session::butler_thread_work () boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader (); +// 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 = dsl->begin(); !transport_work_requested() && butler_should_run && i != dsl->end(); ++i) { boost::shared_ptr<Diskstream> ds = *i; + /* don't read inactive tracks */ + + /*IO* io = ds->io(); + + if (ds->io() && !ds->io()->active()) { + cerr << "Skip inactive diskstream " << ds->io()->name() << endl; + continue; + }*/ + switch (ds->do_refill ()) { case 0: bytes += ds->read_data_count(); @@ -294,6 +303,9 @@ Session::butler_thread_work () for (i = dsl->begin(); !transport_work_requested() && butler_should_run && i != dsl->end(); ++i) { // cerr << "write behind for " << (*i)->name () << endl; + + /* note that we still try to flush diskstreams attached to inactive routes + */ switch ((*i)->do_flush (Session::ButlerContext)) { case 0: |