From 6640c054cf63b14b38630fa730e83a3e96828959 Mon Sep 17 00:00:00 2001 From: dimitri Date: Mon, 2 Apr 2018 09:10:07 -0700 Subject: [PATCH] cleanup remnants of cafdecoder; additional final/default qualifiers on derived BaseDevocer classes; coding style --- include/libnyquist/FlacDecoder.h | 12 ++++++------ include/libnyquist/MusepackDecoder.h | 12 ++++++------ include/libnyquist/OpusDecoder.h | 12 ++++++------ include/libnyquist/VorbisDecoder.h | 12 ++++++------ include/libnyquist/WavDecoder.h | 10 +++++----- include/libnyquist/WavPackDecoder.h | 12 ++++++------ src/AudioDecoder.cpp | 2 -- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/include/libnyquist/FlacDecoder.h b/include/libnyquist/FlacDecoder.h index 93e737a..998882e 100644 --- a/include/libnyquist/FlacDecoder.h +++ b/include/libnyquist/FlacDecoder.h @@ -51,13 +51,13 @@ inline std::map GetQualityTable() }; } -struct FlacDecoder : public nqr::BaseDecoder +struct FlacDecoder final : public nqr::BaseDecoder { - FlacDecoder() {} - virtual ~FlacDecoder() {} - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + FlacDecoder() = default; + virtual ~FlacDecoder() override {} + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/include/libnyquist/MusepackDecoder.h b/include/libnyquist/MusepackDecoder.h index 0f5f453..4a8eb11 100644 --- a/include/libnyquist/MusepackDecoder.h +++ b/include/libnyquist/MusepackDecoder.h @@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace nqr { -struct MusepackDecoder : public nqr::BaseDecoder +struct MusepackDecoder final : public nqr::BaseDecoder { - MusepackDecoder() {}; - virtual ~MusepackDecoder() {}; - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + MusepackDecoder() = default; + virtual ~MusepackDecoder() override {}; + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/include/libnyquist/OpusDecoder.h b/include/libnyquist/OpusDecoder.h index 2a40f1b..23ac0a3 100644 --- a/include/libnyquist/OpusDecoder.h +++ b/include/libnyquist/OpusDecoder.h @@ -36,13 +36,13 @@ namespace nqr // an archival format or something designed for heavy DSP post-processing since // it's fundamentally limited to encode/decode at 48khz. // https://mf4.xiph.org/jenkins/view/opus/job/opusfile-unix/ws/doc/html/index.html -struct OpusDecoder : public nqr::BaseDecoder +struct OpusDecoder final : public nqr::BaseDecoder { - OpusDecoder() {} - virtual ~OpusDecoder() {} - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + OpusDecoder() = default; + virtual ~OpusDecoder() override {} + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/include/libnyquist/VorbisDecoder.h b/include/libnyquist/VorbisDecoder.h index 2f2ea47..10308b7 100644 --- a/include/libnyquist/VorbisDecoder.h +++ b/include/libnyquist/VorbisDecoder.h @@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace nqr { -struct VorbisDecoder : public nqr::BaseDecoder +struct VorbisDecoder final : public nqr::BaseDecoder { - VorbisDecoder() {} - virtual ~VorbisDecoder() {} - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + VorbisDecoder() = default; + virtual ~VorbisDecoder() override {} + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/include/libnyquist/WavDecoder.h b/include/libnyquist/WavDecoder.h index 536de42..527ef78 100644 --- a/include/libnyquist/WavDecoder.h +++ b/include/libnyquist/WavDecoder.h @@ -168,13 +168,13 @@ inline int ComputeChannelMask(const size_t channels) } } -struct WavDecoder : public nqr::BaseDecoder +struct WavDecoder final : public nqr::BaseDecoder { - WavDecoder() {} + WavDecoder() = default; virtual ~WavDecoder() {} - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/include/libnyquist/WavPackDecoder.h b/include/libnyquist/WavPackDecoder.h index 6503b65..7daec04 100644 --- a/include/libnyquist/WavPackDecoder.h +++ b/include/libnyquist/WavPackDecoder.h @@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace nqr { -struct WavPackDecoder : public nqr::BaseDecoder +struct WavPackDecoder final : public nqr::BaseDecoder { - WavPackDecoder() {}; - virtual ~WavPackDecoder() {}; - virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; - virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override; - virtual std::vector GetSupportedFileExtensions() override; + WavPackDecoder() = default; + virtual ~WavPackDecoder() override {}; + virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final; + virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector & memory) override final; + virtual std::vector GetSupportedFileExtensions() override final; }; } // end namespace nqr diff --git a/src/AudioDecoder.cpp b/src/AudioDecoder.cpp index e9f6e11..f3a00d5 100644 --- a/src/AudioDecoder.cpp +++ b/src/AudioDecoder.cpp @@ -30,7 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FlacDecoder.h" #include "VorbisDecoder.h" #include "OpusDecoder.h" -#include "CafDecoder.h" #include "MusepackDecoder.h" #include "ModplugDecoder.h" @@ -133,7 +132,6 @@ void NyquistIO::BuildDecoderTable() AddDecoderToTable(std::make_shared()); AddDecoderToTable(std::make_shared()); AddDecoderToTable(std::make_shared()); - AddDecoderToTable(std::make_shared()); AddDecoderToTable(std::make_shared()); AddDecoderToTable(std::make_shared()); } \ No newline at end of file