diff options
| author | Uwe Klotz <uwe_klotz@web.de> | 2017-11-25 15:31:17 +0100 |
|---|---|---|
| committer | Uwe Klotz <uwe_klotz@web.de> | 2017-11-25 16:02:02 +0100 |
| commit | ee517e365d5ededd670381365669783da1bbcb75 (patch) | |
| tree | f67b28a0eb343de03025b7302448b396bb9181e5 /src/sources/soundsourceflac.cpp | |
| parent | 755d55bd59cc4018d4813f1f2ce3fecb3ae18f02 (diff) | |
Use "length" for both slices and ranges
This also avoids confusion between "slice" and "size" which sound very
similar.
Diffstat (limited to 'src/sources/soundsourceflac.cpp')
| -rw-r--r-- | src/sources/soundsourceflac.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sources/soundsourceflac.cpp b/src/sources/soundsourceflac.cpp index 9c9ca440bf..24a1a6e3c3 100644 --- a/src/sources/soundsourceflac.cpp +++ b/src/sources/soundsourceflac.cpp @@ -265,12 +265,12 @@ ReadableSampleFrames SoundSourceFLAC::readSampleFramesClamped( std::min(m_sampleBuffer.readableLength(), numberOfSamplesRemaining); const SampleBuffer::ReadableSlice readableSlice( m_sampleBuffer.readFromHead(numberOfSamplesRead)); - DEBUG_ASSERT(readableSlice.size() == numberOfSamplesRead); + DEBUG_ASSERT(readableSlice.length() == numberOfSamplesRead); if (writableSampleFrames.writableData()) { SampleUtil::copy( writableSampleFrames.writableData(outputSampleOffset), readableSlice.data(), - readableSlice.size()); + readableSlice.length()); outputSampleOffset += numberOfSamplesRead; } m_curFrameIndex += samples2frames(numberOfSamplesRead); @@ -284,7 +284,7 @@ ReadableSampleFrames SoundSourceFLAC::readSampleFramesClamped( IndexRange::forward(firstFrameIndex, samples2frames(numberOfSamples)), SampleBuffer::ReadableSlice( writableSampleFrames.writableData(), - std::min(writableSampleFrames.writableSize(), numberOfSamples))); + std::min(writableSampleFrames.writableLength(), numberOfSamples))); } // flac callback methods @@ -378,7 +378,7 @@ FLAC__StreamDecoderWriteStatus SoundSourceFLAC::flacWrite( const SampleBuffer::WritableSlice writableSlice( m_sampleBuffer.writeToTail(frames2samples(numReadableFrames))); - const SINT numWritableFrames = samples2frames(writableSlice.size()); + const SINT numWritableFrames = samples2frames(writableSlice.length()); DEBUG_ASSERT(numWritableFrames <= numReadableFrames); if (numWritableFrames < numReadableFrames) { kLogger.warning() << "Sample buffer has not enough free space for all decoded FLAC samples:" |