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/audio_diskstream.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/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index bc42cb0b5b..bc4a352c45 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -850,10 +850,18 @@ AudioDiskstream::commit (nframes_t nframes) } if (_slaved) { - need_butler = c->front()->playback_buf->write_space() >= c->front()->playback_buf->bufsize() / 2; + /*if (_io && _io->active()) {*/ + need_butler = c->front()->playback_buf->write_space() >= c->front()->playback_buf->bufsize() / 2; + /*} else { + need_butler = false; + }*/ } else { - need_butler = c->front()->playback_buf->write_space() >= disk_io_chunk_frames - || c->front()->capture_buf->read_space() >= disk_io_chunk_frames; + /*if (_io && _io->active()) {*/ + need_butler = c->front()->playback_buf->write_space() >= disk_io_chunk_frames + || c->front()->capture_buf->read_space() >= disk_io_chunk_frames; + /*} else { + need_butler = c->front()->capture_buf->read_space() >= disk_io_chunk_frames; + }*/ } if (commit_should_unlock) { @@ -1940,6 +1948,7 @@ AudioDiskstream::set_state (const XMLNode& node) if (nchans > _n_channels.n_audio()) { add_channel (nchans - _n_channels.n_audio()); + IO::PortCountChanged(_n_channels); } else if (nchans < _n_channels.n_audio()) { |