diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-31 20:53:44 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-31 20:54:14 -0600 |
| commit | 6d0434a3c5d5079f82c569281da14880e4de0be7 (patch) | |
| tree | 9835d4e772b5db8abcddb74a9518495e6b0abc82 /libs/ardour/disk_reader.cc | |
| parent | 0047dc383f4c658508c67d18a63201f954076c44 (diff) | |
change variable name and debug messages for underrun case (information was misleading/confusing)
Diffstat (limited to 'libs/ardour/disk_reader.cc')
| -rw-r--r-- | libs/ardour/disk_reader.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 07f49d398c..287c02af0b 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -397,13 +397,11 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp if (!declick_out) { - const samplecnt_t total = chaninfo->rbuf->read (disk_buf.data(), disk_samples_to_consume); + const samplecnt_t available = chaninfo->rbuf->read (disk_buf.data(), disk_samples_to_consume); - if (disk_samples_to_consume > total) { - cerr << _name << " Need " << total << " have only " << disk_samples_to_consume << endl; - cerr << "underrun for " << _name << endl; - DEBUG_TRACE (DEBUG::Butler, string_compose ("%1 underrun in %2, total space = %3\n", - DEBUG_THREAD_SELF, name(), total)); + if (disk_samples_to_consume > available) { + cerr << "underrun for " << _name << " Available samples: " << available << " required: " << disk_samples_to_consume << endl; + DEBUG_TRACE (DEBUG::Butler, string_compose ("%1 underrun in %2, total space = %3 vs %4\n", DEBUG_THREAD_SELF, name(), available, disk_samples_to_consume)); Underrun (); return; } |