diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-12 23:02:16 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:13 -0400 |
commit | 30a698f42e3ee6be5a63ea1143413cf8329f444e (patch) | |
tree | 1a21a9d0b0c177c87ecd9fd6f7b87587aecacf58 /libs/ardour/butler.cc | |
parent | e52375aa4019a8adfb1960e9364f4650c0479b74 (diff) |
correct placement of buffering adjustments w.r.t Butler thread creation
Diffstat (limited to 'libs/ardour/butler.cc')
-rw-r--r-- | libs/ardour/butler.cc | 18 |
1 files changed, 9 insertions, 9 deletions
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; } |