diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-29 21:25:04 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-02 16:32:18 -0600 |
| commit | 81b38c110a410712b103a1bd62b2f1f2d220bfab (patch) | |
| tree | 69c122f48e5c1e2a7c15779eb5f8adb183addc8c /libs | |
| parent | 3ec845b1ef1184719de2160bf572b667c9aa4bda (diff) | |
remove unused (empty) API
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/disk_reader.h | 1 | ||||
| -rw-r--r-- | libs/ardour/disk_reader.cc | 34 |
2 files changed, 8 insertions, 27 deletions
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 2ceeea1190..20f1e93601 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -183,7 +183,6 @@ private: int refill (Sample* sum_buffer, Sample* mixdown_buffer, float* gain_buffer, samplecnt_t fill_level); int refill_audio (Sample* sum_buffer, Sample *mixdown_buffer, float *gain_buffer, samplecnt_t fill_level); - int refill_midi (); sampleoffset_t calculate_playback_distance (pframes_t); diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 0df940a13b..0408448506 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -762,31 +762,20 @@ DiskReader::_do_refill_with_alloc (bool partial_fill) the smallest sample value .. 4MB = 2M samples (16 bit). */ - { - boost::scoped_array<Sample> sum_buf (new Sample[2*1048576]); - boost::scoped_array<Sample> mix_buf (new Sample[2*1048576]); - boost::scoped_array<float> gain_buf (new float[2*1048576]); + boost::scoped_array<Sample> sum_buf (new Sample[2*1048576]); + boost::scoped_array<Sample> mix_buf (new Sample[2*1048576]); + boost::scoped_array<float> gain_buf (new float[2*1048576]); - int ret = refill_audio (sum_buf.get(), mix_buf.get(), gain_buf.get(), (partial_fill ? _chunk_samples : 0)); - - if (ret) { - return ret; - } - } - - return refill_midi (); + return refill_audio (sum_buf.get(), mix_buf.get(), gain_buf.get(), (partial_fill ? _chunk_samples : 0)); } int DiskReader::refill (Sample* sum_buffer, Sample* mixdown_buffer, float* gain_buffer, samplecnt_t fill_level) { - int ret = refill_audio (sum_buffer, mixdown_buffer, gain_buffer, fill_level); - - if (ret) { - return ret; - } - - return refill_midi (); + /* nothing to do here for MIDI - the entire playlist has been rendered + * into RAM already. + */ + return refill_audio (sum_buffer, mixdown_buffer, gain_buffer, fill_level); } @@ -1173,13 +1162,6 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, sample #endif } -int -DiskReader::refill_midi () -{ - /* nothing to do ... it's all in RAM thanks to overwrite */ - return 0; -} - void DiskReader::dec_no_disk_output () { |