Browse Source

WavAudioImporter: various cleanup.

pull/116/head
Vladimír Vondruš 11 years ago
parent
commit
2826181691
  1. 19
      src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
  2. 2
      src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
  3. 2
      src/MagnumPlugins/WavAudioImporter/WavImporter.h

19
src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp

@ -26,6 +26,7 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/ArrayView.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/Utility/Directory.h> #include <Corrade/Utility/Directory.h>
#include "MagnumPlugins/WavAudioImporter/WavImporter.h" #include "MagnumPlugins/WavAudioImporter/WavImporter.h"
@ -97,12 +98,9 @@ void WavImporterTest::mono16() {
CORRADE_COMPARE(importer.format(), Buffer::Format::Mono16); CORRADE_COMPARE(importer.format(), Buffer::Format::Mono16);
CORRADE_COMPARE(importer.frequency(), 44000); CORRADE_COMPARE(importer.frequency(), 44000);
Containers::Array<char> data = importer.data(); CORRADE_COMPARE_AS(importer.data(),
CORRADE_COMPARE(data.size(), 4); Containers::Array<char>::from('\x1d', '\x10', '\x71', '\xc5'),
CORRADE_COMPARE(data[0], '\x1d'); TestSuite::Compare::Container);
CORRADE_COMPARE(data[1], '\x10');
CORRADE_COMPARE(data[2], '\x71');
CORRADE_COMPARE(data[3], '\xc5');
} }
void WavImporterTest::stereo8() { void WavImporterTest::stereo8() {
@ -111,12 +109,9 @@ void WavImporterTest::stereo8() {
CORRADE_COMPARE(importer.format(), Buffer::Format::Stereo8); CORRADE_COMPARE(importer.format(), Buffer::Format::Stereo8);
CORRADE_COMPARE(importer.frequency(), 96000); CORRADE_COMPARE(importer.frequency(), 96000);
Containers::Array<char> data = importer.data(); CORRADE_COMPARE_AS(importer.data(),
CORRADE_COMPARE(data.size(), 4); Containers::Array<char>::from('\xde', '\xfe', '\xca', '\x7e'),
CORRADE_COMPARE(data[0], '\xde'); TestSuite::Compare::Container);
CORRADE_COMPARE(data[1], '\xfe');
CORRADE_COMPARE(data[2], '\xca');
CORRADE_COMPARE(data[3], '\x7e');
} }
}}} }}}

2
src/MagnumPlugins/WavAudioImporter/WavImporter.cpp

@ -37,8 +37,6 @@ WavImporter::WavImporter() = default;
WavImporter::WavImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {} WavImporter::WavImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {}
WavImporter::~WavImporter() { close(); }
auto WavImporter::doFeatures() const -> Features { return Feature::OpenData; } auto WavImporter::doFeatures() const -> Features { return Feature::OpenData; }
bool WavImporter::doIsOpened() const { return _data; } bool WavImporter::doIsOpened() const { return _data; }

2
src/MagnumPlugins/WavAudioImporter/WavImporter.h

@ -57,8 +57,6 @@ class WavImporter: public AbstractImporter {
/** @brief Plugin manager constructor */ /** @brief Plugin manager constructor */
explicit WavImporter(PluginManager::AbstractManager& manager, std::string plugin); explicit WavImporter(PluginManager::AbstractManager& manager, std::string plugin);
~WavImporter();
private: private:
Features doFeatures() const override; Features doFeatures() const override;
bool doIsOpened() const override; bool doIsOpened() const override;

Loading…
Cancel
Save