From c528b75f96ec030e04ccac68cb49c6d4184e5f54 Mon Sep 17 00:00:00 2001
From: Alice <loveoverwhelming@gmail.com>
Date: Sat, 24 Sep 2016 20:54:57 -0400
Subject: [PATCH] Move defines

---
 src/MagnumPlugins/WavAudioImporter/WavHeader.h     | 8 +-------
 src/MagnumPlugins/WavAudioImporter/WavImporter.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MagnumPlugins/WavAudioImporter/WavHeader.h b/src/MagnumPlugins/WavAudioImporter/WavHeader.h
index 750ff0c10..8ed8642ae 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavHeader.h
+++ b/src/MagnumPlugins/WavAudioImporter/WavHeader.h
@@ -31,12 +31,6 @@
 
 #include "Magnum/Types.h"
 
-#define WAVE_FORMAT_PCM 0x0001
-#define WAVE_FORMAT_IEEE_FLOAT 0x0003
-#define WAVE_FORMAT_ALAW 0x0006
-#define WAVE_FORMAT_MULAW 0x0007
-#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
-
 namespace Magnum { namespace Audio {
 
 #pragma pack(1)
@@ -68,7 +62,7 @@ struct WavFormatChunk {
 };
 #pragma pack()
 
-static_assert(sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(WavDataChunk) == 44, "WavHeader size is not 44 bytes");
+static_assert(sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(RiffChunk) == 44, "WavHeader size is not 44 bytes");
 
 }}
 
diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
index 7786c53a9..82630c883 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
+++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
@@ -31,6 +31,12 @@
 
 #include "MagnumPlugins/WavAudioImporter/WavHeader.h"
 
+#define WAVE_FORMAT_PCM 0x0001
+#define WAVE_FORMAT_IEEE_FLOAT 0x0003
+#define WAVE_FORMAT_ALAW 0x0006
+#define WAVE_FORMAT_MULAW 0x0007
+#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
+
 namespace Magnum { namespace Audio {
 
 WavImporter::WavImporter() = default;
@@ -43,7 +49,7 @@ bool WavImporter::doIsOpened() const { return _data; }
 
 void WavImporter::doOpenData(Containers::ArrayView<const char> data) {
     /* Check file size */
-    if(data.size() < sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(WavDataChunk)) {
+    if(data.size() < sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(RiffChunk)) {
         Error() << "Audio::WavImporter::openData(): the file is too short:" << data.size() << "bytes";
         return;
     }