From 674ed2430cae5e5d5e50eab854de642c9e4bd4fd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 6 Feb 2011 18:32:22 +0000 Subject: [PATCH] Couple of asserts to catch similar bugs to #3755 a bit earlier. git-svn-id: svn://localhost/ardour2/branches/3.0@8728 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_diskstream.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 2ee824845a..8a161c3977 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1167,6 +1167,8 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer) to_read = min (ts, len1); to_read = min (to_read, disk_io_chunk_frames); + assert (to_read >= 0); + if (to_read) { if (read (buf1, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan, chan_n, reversed)) { @@ -1201,7 +1203,8 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer) } file_frame = file_frame_tmp; - + assert (file_frame >= 0); + out: return ret;