summaryrefslogtreecommitdiff
path: root/libs/ardour/butler.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-06-09 14:11:46 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-06-09 14:11:46 +0000
commit2b9dc7b380bb4e40171067f42b4010970869a57d (patch)
tree6f24f5035d79ce84d758f40c3ee6c071e064ca58 /libs/ardour/butler.cc
parent1e728e728a79d9b272cc18bc1c46f0c3c8831bf8 (diff)
permit different sizes for audio playback & capture buffers
git-svn-id: svn://localhost/ardour2/branches/3.0@7248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/butler.cc')
-rw-r--r--libs/ardour/butler.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 9847d55e40..1eb96dea35 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -43,7 +43,8 @@ namespace ARDOUR {
Butler::Butler(Session& s)
: SessionHandleRef (s)
, thread(0)
- , audio_dstream_buffer_size(0)
+ , audio_dstream_capture_buffer_size(0)
+ , audio_dstream_playback_buffer_size(0)
, midi_dstream_buffer_size(0)
, pool_trash(16)
{
@@ -62,7 +63,8 @@ Butler::start_thread()
const float rate = (float)_session.frame_rate();
/* size is in Samples, not bytes */
- audio_dstream_buffer_size = (uint32_t) floor (Config->get_audio_track_buffer_seconds() * rate);
+ audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * rate);
+ audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * rate);
/* size is in bytes
* XXX: Jack needs to tell us the MIDI buffer size
@@ -72,7 +74,7 @@ Butler::start_thread()
MidiDiskstream::set_readahead_frames ((nframes_t)(Config->get_midi_readahead() * rate));
- Crossfade::set_buffer_size (audio_dstream_buffer_size);
+ Crossfade::set_buffer_size (audio_dstream_playback_buffer_size);
should_run = false;