sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #463 from jpcima/misc

Browse source 
Misc fixes: missing return, bad const qualification
This commit is contained in:
JP Cimalando 2020-09-30 01:52:29 +02:00 • committed by GitHub
commit 7933bcec8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sfizz/AudioSpan.h
View file

@ -200,7 +200,7 @@ public:
* @param channelIndex the channel
* @return Type* the raw pointer to the channel
*/
Type* getChannel(size_t channelIndex)
Type* getChannel(size_t channelIndex) const
{
ASSERT(channelIndex < numChannels);
if (channelIndex < numChannels)
@ -231,7 +231,7 @@ public:
* @param channelIndex the channel
* @return absl::Span<Type>
*/
absl::Span<Type> getSpan(size_t channelIndex)
absl::Span<Type> getSpan(size_t channelIndex) const
{
ASSERT(channelIndex < numChannels);
if (channelIndex < numChannels)
@ -402,7 +402,7 @@ public:
*
* @param length the number of elements to take on each channel
*/
AudioSpan<Type> first(size_type length)
AudioSpan<Type> first(size_type length) const
{
ASSERT(length <= numFrames);
return { spans, numChannels, 0, length };
@ -413,7 +413,7 @@ public:
*
* @param length the number of elements to take on each channel
*/
AudioSpan<Type> last(size_type length)
AudioSpan<Type> last(size_type length) const
{
ASSERT(length <= numFrames);
return { spans, numChannels, numFrames - length, length };
@ -427,7 +427,7 @@ public:
*
* @param length the number of elements to take on each channel
*/
AudioSpan<Type> subspan(size_type offset, size_type length)
AudioSpan<Type> subspan(size_type offset, size_type length) const
{
ASSERT(length + offset <= numFrames);
return { spans, numChannels, offset, length };
@ -440,7 +440,7 @@ public:
*
* @param length the number of elements to take on each channel
*/
AudioSpan<Type> subspan(size_type offset)
AudioSpan<Type> subspan(size_type offset) const
{
ASSERT(offset <= numFrames);
return { spans, numChannels, offset, numFrames - offset };

1
src/sfizz/BufferPool.h
View file

@ -36,6 +36,7 @@ public:
this->value = other.value;
this->available = other.available;
other.available = nullptr;
return *this;
}
SpanHolder(T&& value, int* available)
: value(std::forward<T>(value))

2
src/sfizz/Voice.cpp
View file

@ -615,7 +615,7 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
template <sfz::InterpolatorModel M>
void sfz::Voice::fillInterpolated(
const sfz::AudioSpan<const float>& source, sfz::AudioSpan<float>& dest,
const sfz::AudioSpan<const float>& source, const sfz::AudioSpan<float>& dest,
absl::Span<const int> indices, absl::Span<const float> coeffs)
{
auto ind = indices.data();

2
src/sfizz/Voice.h
View file

@ -376,7 +376,7 @@ private:
*/
template <InterpolatorModel M>
static void fillInterpolated(
const AudioSpan<const float>& source, AudioSpan<float>& dest,
const AudioSpan<const float>& source, const AudioSpan<float>& dest,
absl::Span<const int> indices, absl::Span<const float> coeffs);
/**