alex
/
libnyquist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup remnants of cafdecoder; additional final/default qualifiers on derived BaseDevocer classes; coding style

Browse Source
magic-numbers
dimitri 8 years ago
parent 99250daf6c
commit 6640c054cf
7 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File

12
include/libnyquist/FlacDecoder.h
Unescape Escape View File

@ -51,13 +51,13 @@ inline std::map<int, std::string> GetQualityTable()
}; };
} }
struct FlacDecoder : public nqr::BaseDecoder struct FlacDecoder final : public nqr::BaseDecoder
{ {
FlacDecoder() {} FlacDecoder() = default;
virtual ~FlacDecoder() {} virtual ~FlacDecoder() override {}
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

12
include/libnyquist/MusepackDecoder.h
Unescape Escape View File

@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace nqr namespace nqr
{ {
struct MusepackDecoder : public nqr::BaseDecoder struct MusepackDecoder final : public nqr::BaseDecoder
{ {
MusepackDecoder() {}; MusepackDecoder() = default;
virtual ~MusepackDecoder() {}; virtual ~MusepackDecoder() override {};
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

12
include/libnyquist/OpusDecoder.h
Unescape Escape View File

@ -36,13 +36,13 @@ namespace nqr
// an archival format or something designed for heavy DSP post-processing since // an archival format or something designed for heavy DSP post-processing since
// it's fundamentally limited to encode/decode at 48khz. // it's fundamentally limited to encode/decode at 48khz.
// https://mf4.xiph.org/jenkins/view/opus/job/opusfile-unix/ws/doc/html/index.html // 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() {} OpusDecoder() = default;
virtual ~OpusDecoder() {} virtual ~OpusDecoder() override {}
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

12
include/libnyquist/VorbisDecoder.h
Unescape Escape View File

@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace nqr namespace nqr
{ {
struct VorbisDecoder : public nqr::BaseDecoder struct VorbisDecoder final : public nqr::BaseDecoder
{ {
VorbisDecoder() {} VorbisDecoder() = default;
virtual ~VorbisDecoder() {} virtual ~VorbisDecoder() override {}
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

10
include/libnyquist/WavDecoder.h
Unescape Escape View File

@ -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 ~WavDecoder() {}
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

12
include/libnyquist/WavPackDecoder.h
Unescape Escape View File

@ -31,13 +31,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace nqr namespace nqr
{ {
struct WavPackDecoder : public nqr::BaseDecoder struct WavPackDecoder final : public nqr::BaseDecoder
{ {
WavPackDecoder() {}; WavPackDecoder() = default;
virtual ~WavPackDecoder() {}; virtual ~WavPackDecoder() override {};
virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override; virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) override final;
virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override; virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) override final;
virtual std::vector<std::string> GetSupportedFileExtensions() override; virtual std::vector<std::string> GetSupportedFileExtensions() override final;
}; };
} // end namespace nqr } // end namespace nqr

2
src/AudioDecoder.cpp
Unescape Escape View File

@ -30,7 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "FlacDecoder.h" #include "FlacDecoder.h"
#include "VorbisDecoder.h" #include "VorbisDecoder.h"
#include "OpusDecoder.h" #include "OpusDecoder.h"
#include "CafDecoder.h"
#include "MusepackDecoder.h" #include "MusepackDecoder.h"
#include "ModplugDecoder.h" #include "ModplugDecoder.h"
@ -133,7 +132,6 @@ void NyquistIO::BuildDecoderTable()
AddDecoderToTable(std::make_shared<FlacDecoder>()); AddDecoderToTable(std::make_shared<FlacDecoder>());
AddDecoderToTable(std::make_shared<VorbisDecoder>()); AddDecoderToTable(std::make_shared<VorbisDecoder>());
AddDecoderToTable(std::make_shared<OpusDecoder>()); AddDecoderToTable(std::make_shared<OpusDecoder>());
AddDecoderToTable(std::make_shared<CAFDecoder>());
AddDecoderToTable(std::make_shared<MusepackDecoder>()); AddDecoderToTable(std::make_shared<MusepackDecoder>());
AddDecoderToTable(std::make_shared<ModplugDecoder>()); AddDecoderToTable(std::make_shared<ModplugDecoder>());
} }
Write Preview
Loading…
Cancel
Save