From 873d884fb2e88ac32930fb7c8ad907f4a681ccf4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 21 May 2008 07:45:45 +0000 Subject: Separate audio and MIDI disk buffer size (and track read ahead) parameters. Clean up and remove more unused stuff from MidiDiskstream. Remove false assumptions that MIDI ring buffer space (bytes) corresponds to disk I/O chunk length (frames). git-svn-id: svn://localhost/ardour2/branches/3.0@3375 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_butler.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libs/ardour/session_butler.cc') diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index 2ac06e57dd..ec5de23caf 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -69,10 +69,15 @@ int Session::start_butler_thread () { /* size is in Samples, not bytes */ - - dstream_buffer_size = (uint32_t) floor (Config->get_track_buffer_seconds() * (float) frame_rate()); - - Crossfade::set_buffer_size (dstream_buffer_size); + audio_dstream_buffer_size = (uint32_t) floor (Config->get_audio_track_buffer_seconds() * (float) frame_rate()); + + /* size is in bytes + * XXX: Jack needs to tell us the MIDI buffer size + * (i.e. how many MIDI bytes we might see in a cycle) + */ + midi_dstream_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * (float)frame_rate()); + + Crossfade::set_buffer_size (audio_dstream_buffer_size); butler_should_run = false; -- cgit v1.2.3