From 9169f966abbf45c8714399d03d06673feaebe44a Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 10 Dec 2016 10:00:19 -0800 Subject: [PATCH] Constify some methods --- examples/alure-dumb.cpp | 4 ++-- include/AL/alure2.h | 8 ++++---- src/decoders/flac.cpp | 8 ++++---- src/decoders/mpg123.cpp | 8 ++++---- src/decoders/opusfile.cpp | 8 ++++---- src/decoders/sndfile.cpp | 8 ++++---- src/decoders/vorbisfile.cpp | 8 ++++---- src/decoders/wave.cpp | 8 ++++---- src/sourcegroup.cpp | 4 ++-- src/sourcegroup.h | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/alure-dumb.cpp b/examples/alure-dumb.cpp index 305f690..1ad4b20 100644 --- a/examples/alure-dumb.cpp +++ b/examples/alure-dumb.cpp @@ -116,14 +116,14 @@ public: return alure::SampleType::Int16; } - uint64_t getLength() override final + uint64_t getLength() const override final { // Modules have no explicit length, they just keep playing as long as // more samples get generated. return 0; } - uint64_t getPosition() override final + uint64_t getPosition() const override final { return mStreamPos; } diff --git a/include/AL/alure2.h b/include/AL/alure2.h index 1d89229..db8fc39 100644 --- a/include/AL/alure2.h +++ b/include/AL/alure2.h @@ -876,10 +876,10 @@ public: virtual void removeSubGroup(SourceGroup *group) = 0; /** Returns the list of sources currently in the group. */ - virtual Vector getSources() = 0; + virtual Vector getSources() const = 0; /** Returns the list of subgroups currently in the group. */ - virtual Vector getSubGroups() = 0; + virtual Vector getSubGroups() const = 0; /** Sets the source group gain, which accumulates with its sources. */ virtual void setGain(ALfloat gain) = 0; @@ -986,12 +986,12 @@ public: * returns 0. Note that if the returned length is 0, the decoder may not be * used to load a \ref Buffer. */ - virtual uint64_t getLength() = 0; + virtual uint64_t getLength() const = 0; /** * Retrieves the current sample frame position (i.e. the number of sample * frames from the beginning). */ - virtual uint64_t getPosition() = 0; + virtual uint64_t getPosition() const = 0; /** * Seek to \param pos, specified in sample frames. Returns true if the seek * was successful. diff --git a/src/decoders/flac.cpp b/src/decoders/flac.cpp index b6b07e6..2e7ef69 100644 --- a/src/decoders/flac.cpp +++ b/src/decoders/flac.cpp @@ -172,8 +172,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -237,12 +237,12 @@ SampleType FlacDecoder::getSampleType() const } -uint64_t FlacDecoder::getLength() +uint64_t FlacDecoder::getLength() const { return FLAC__stream_decoder_get_total_samples(mFlacFile); } -uint64_t FlacDecoder::getPosition() +uint64_t FlacDecoder::getPosition() const { return mSamplePos; } diff --git a/src/decoders/mpg123.cpp b/src/decoders/mpg123.cpp index f37284e..0772b5f 100644 --- a/src/decoders/mpg123.cpp +++ b/src/decoders/mpg123.cpp @@ -46,8 +46,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -83,13 +83,13 @@ SampleType Mpg123Decoder::getSampleType() const } -uint64_t Mpg123Decoder::getLength() +uint64_t Mpg123Decoder::getLength() const { off_t len = mpg123_length(mMpg123); return (ALuint)std::max(len, 0); } -uint64_t Mpg123Decoder::getPosition() +uint64_t Mpg123Decoder::getPosition() const { off_t pos = mpg123_tell(mMpg123); return (ALuint)std::max(pos, 0); diff --git a/src/decoders/opusfile.cpp b/src/decoders/opusfile.cpp index 1b997b4..53ed943 100644 --- a/src/decoders/opusfile.cpp +++ b/src/decoders/opusfile.cpp @@ -65,8 +65,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -97,13 +97,13 @@ SampleType OpusFileDecoder::getSampleType() const } -uint64_t OpusFileDecoder::getLength() +uint64_t OpusFileDecoder::getLength() const { ogg_int64_t len = op_pcm_total(mOggFile, -1); return std::max(len, 0); } -uint64_t OpusFileDecoder::getPosition() +uint64_t OpusFileDecoder::getPosition() const { ogg_int64_t pos = op_pcm_tell(mOggFile); return std::max(pos, 0); diff --git a/src/decoders/sndfile.cpp b/src/decoders/sndfile.cpp index 03a7f18..72d24a3 100644 --- a/src/decoders/sndfile.cpp +++ b/src/decoders/sndfile.cpp @@ -77,8 +77,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -109,12 +109,12 @@ SampleType SndFileDecoder::getSampleType() const } -uint64_t SndFileDecoder::getLength() +uint64_t SndFileDecoder::getLength() const { return std::max(mSndInfo.frames, 0); } -uint64_t SndFileDecoder::getPosition() +uint64_t SndFileDecoder::getPosition() const { sf_count_t pos = sf_seek(mSndFile, 0, SEEK_CUR); return std::max(pos, 0); diff --git a/src/decoders/vorbisfile.cpp b/src/decoders/vorbisfile.cpp index 8f6092c..00fbb9c 100644 --- a/src/decoders/vorbisfile.cpp +++ b/src/decoders/vorbisfile.cpp @@ -69,8 +69,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -100,13 +100,13 @@ SampleType VorbisFileDecoder::getSampleType() const } -uint64_t VorbisFileDecoder::getLength() +uint64_t VorbisFileDecoder::getLength() const { ogg_int64_t len = ov_pcm_total(mOggFile.get(), -1); return std::max(len, 0); } -uint64_t VorbisFileDecoder::getPosition() +uint64_t VorbisFileDecoder::getPosition() const { ogg_int64_t pos = ov_pcm_tell(mOggFile.get()); return std::max(pos, 0); diff --git a/src/decoders/wave.cpp b/src/decoders/wave.cpp index e17eafe..ed7d6a8 100644 --- a/src/decoders/wave.cpp +++ b/src/decoders/wave.cpp @@ -82,8 +82,8 @@ public: ChannelConfig getChannelConfig() const override final; SampleType getSampleType() const override final; - uint64_t getLength() override final; - uint64_t getPosition() override final; + uint64_t getLength() const override final; + uint64_t getPosition() const override final; bool seek(uint64_t pos) override final; std::pair getLoopPoints() const override final; @@ -112,12 +112,12 @@ SampleType WaveDecoder::getSampleType() const } -uint64_t WaveDecoder::getLength() +uint64_t WaveDecoder::getLength() const { return (mEnd - mStart) / mFrameSize; } -uint64_t WaveDecoder::getPosition() +uint64_t WaveDecoder::getPosition() const { mFile->clear(); return (std::max(mFile->tellg(), mStart) - mStart) / mFrameSize; diff --git a/src/sourcegroup.cpp b/src/sourcegroup.cpp index f46596b..455583f 100644 --- a/src/sourcegroup.cpp +++ b/src/sourcegroup.cpp @@ -155,14 +155,14 @@ void ALSourceGroup::removeSubGroup(SourceGroup *group) } -Vector ALSourceGroup::getSources() +Vector ALSourceGroup::getSources() const { Vector ret; std::copy(mSources.begin(), mSources.end(), std::back_inserter(ret)); return ret; } -alure::Vector ALSourceGroup::getSubGroups() +alure::Vector ALSourceGroup::getSubGroups() const { Vector ret; std::copy(mSubGroups.begin(), mSubGroups.end(), std::back_inserter(ret)); diff --git a/src/sourcegroup.h b/src/sourcegroup.h index 54cf404..17a10fa 100644 --- a/src/sourcegroup.h +++ b/src/sourcegroup.h @@ -74,9 +74,9 @@ public: void addSubGroup(SourceGroup *group) override final; void removeSubGroup(SourceGroup *group) override final; - Vector getSources() override final; + Vector getSources() const override final; - Vector getSubGroups() override final; + Vector getSubGroups() const override final; void setGain(ALfloat gain) override final; ALfloat getGain() const override final { return mGain; } -- 2.11.4.GIT