Browse Source

WavAudioImporter: put new enums into the Debug output operator.

Adapted tests and changed case of the AdPcm value.
pull/179/head
Vladimír Vondruš 10 years ago
parent
commit
d3fc5f9410
  1. 6
      src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
  2. 2
      src/MagnumPlugins/WavAudioImporter/WavHeader.cpp
  3. 2
      src/MagnumPlugins/WavAudioImporter/WavHeader.h

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

@ -138,7 +138,7 @@ void WavImporterTest::unsupportedFormat() {
WavImporter importer;
CORRADE_VERIFY(!importer.openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "unsupportedFormat.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat(0x2)\n");
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
}
void WavImporterTest::unsupportedChannelCount() {
@ -195,7 +195,7 @@ void WavImporterTest::mono4() {
WavImporter importer;
CORRADE_VERIFY(!importer.openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono4.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat(0x2)\n");
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
}
void WavImporterTest::mono8() {
@ -264,7 +264,7 @@ void WavImporterTest::stereo4() {
WavImporter importer;
CORRADE_VERIFY(!importer.openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo4.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat(0x2)\n");
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
}
void WavImporterTest::stereo8() {

2
src/MagnumPlugins/WavAudioImporter/WavHeader.cpp

@ -39,7 +39,9 @@ Debug& operator<<(Debug& debug, const WavAudioFormat value) {
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case WavAudioFormat::value: return debug << "Audio::WavAudioFormat::" #value;
_c(Unknown)
_c(Pcm)
_c(AdPcm)
_c(IeeeFloat)
_c(ALaw)
_c(MuLaw)

2
src/MagnumPlugins/WavAudioImporter/WavHeader.h

@ -38,7 +38,7 @@ namespace Magnum { namespace Audio {
enum class WavAudioFormat: UnsignedShort {
Unknown = 0x0000, /**< Unknown */
Pcm = 0x0001, /**< PCM */
Adpcm = 0x0002, /**< Adaptive Differential PCM */
AdPcm = 0x0002, /**< Adaptive Differential PCM */
IeeeFloat = 0x0003, /**< IEEE Float */
ALaw = 0x0006, /**< A-Law */
MuLaw = 0x0007, /**< μ-Law */

Loading…
Cancel
Save