diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-07 20:14:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-07 20:14:16 +0000 |
| commit | 18695cdfe3cc600360ad15d37d55eb6a4e8d4a2f (patch) | |
| tree | e91b228c968145e54ea57b1206c7b763e28c04e3 /libs/ardour/session_butler.cc | |
| parent | 3b6300156b240e3daeab3cd34d1b937a20a657f2 (diff) | |
merge keybindings/menus from SAE; report duplicate port errors during session loading more usefully; do not do disk i/o from inactive tracks (related: move Route::_active to IO::_active
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2834 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..eba5e65525 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: |