From 30a698f42e3ee6be5a63ea1143413cf8329f444e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 12 May 2015 23:02:16 -0400 Subject: correct placement of buffering adjustments w.r.t Butler thread creation --- libs/ardour/butler.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libs/ardour/butler.cc') diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 2e79825978..f8f8c83eba 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -104,16 +104,16 @@ Butler::config_changed (std::string p) int Butler::start_thread() { - // set up capture and playback buffering - Diskstream::set_buffering_parameters (Config->get_buffering_preset()); - + // set up capture and playback buffering + Diskstream::set_buffering_parameters (Config->get_buffering_preset()); + /* size is in Samples, not bytes */ - const float rate = (float)_session.frame_rate(); + const float rate = (float)_session.frame_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 + * XXX: AudioEngine 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() * rate); @@ -130,10 +130,10 @@ Butler::start_thread() //pthread_detach (thread); have_thread = true; - // we are ready to request buffer adjustments - _session.adjust_capture_buffering (); - _session.adjust_playback_buffering (); - + // we are ready to request buffer adjustments + _session.adjust_capture_buffering (); + _session.adjust_playback_buffering (); + return 0; } -- cgit v1.2.3