summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_diskstream.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-09-14 15:55:27 +0000
committerCarl Hetherington <carl@carlh.net>2011-09-14 15:55:27 +0000
commit8f5dd22c511737e4da61a727498d7229ddb588c1 (patch)
treed2eb9c0bc86d0af48fc15a5884c8e1ef6bd7de75 /libs/ardour/audio_diskstream.cc
parentf4f57062651bef38f077d922faf8f7e3402e0ed7 (diff)
Fix default disk_io_chunk_frames for diskstream so that it
isn't larger than the default playback buffer size when starting Ardour without a previous ~/.config; having disk_io_chunk_frames larger violates basic design assumptions and causes phantom underruns in playback (#4308). git-svn-id: svn://localhost/ardour2/branches/3.0@10079 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
-rw-r--r--libs/ardour/audio_diskstream.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 1132b2a050..878fa94b5e 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1021,6 +1021,10 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer)
at higher speeds, just do it because the sync between butler
and audio thread may not be good enough.
+
+ Note: it is a design assumption that disk_io_chunk_frames is smaller
+ than the playback buffer size, so this check should never trip when
+ the playback buffer is empty.
*/
if ((total_space < disk_io_chunk_frames) && fabs (_actual_speed) < 2.0f) {