Browse Source

Add final touches to documentation

pull/175/head
Alice 10 years ago
parent
commit
5deda17082
  1. 4
      src/Magnum/Audio/Test/CMakeLists.txt
  2. 19
      src/MagnumPlugins/WavAudioImporter/WavHeader.h

4
src/Magnum/Audio/Test/CMakeLists.txt

@ -36,9 +36,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio)
target_include_directories(AudioAbstractImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(AudioAbstractImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio)
#corrade_add_test(AudioContextTest ContextTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioContextTest ContextTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio)
#corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio)
if(BUILD_AL_TESTS) if(BUILD_AL_TESTS)
corrade_add_test(AudioBufferALTest BufferALTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioBufferALTest BufferALTest.cpp LIBRARIES MagnumAudio)

19
src/MagnumPlugins/WavAudioImporter/WavHeader.h

@ -50,7 +50,7 @@ struct RiffChunk {
#pragma pack(1) #pragma pack(1)
/** @brief WAV file header */ /** @brief WAV file header */
struct WavHeaderChunk { struct WavHeaderChunk {
RiffChunk chunk; RiffChunk chunk; /**< @brief Starting RIFF chunk */
char format[4]; /**< @brief `WAVE` characters */ char format[4]; /**< @brief `WAVE` characters */
}; };
#pragma pack() #pragma pack()
@ -58,7 +58,7 @@ struct WavHeaderChunk {
#pragma pack(1) #pragma pack(1)
/** @brief WAV 'fmt' header */ /** @brief WAV 'fmt' header */
struct WavFormatChunk { struct WavFormatChunk {
RiffChunk chunk; RiffChunk chunk; /**< @brief Starting RIFF chunk */
UnsignedShort audioFormat; /**< @brief 1 = PCM */ UnsignedShort audioFormat; /**< @brief 1 = PCM */
UnsignedShort numChannels; /**< @brief 1 = Mono, 2 = Stereo */ UnsignedShort numChannels; /**< @brief 1 = Mono, 2 = Stereo */
UnsignedInt sampleRate; /**< @brief Sample rate in Hz */ UnsignedInt sampleRate; /**< @brief Sample rate in Hz */
@ -68,21 +68,6 @@ struct WavFormatChunk {
}; };
#pragma pack() #pragma pack()
#pragma pack(1)
/** @brief WAV 'fact' header */
struct WavFactChunk {
RiffChunk chunk;
UnsignedInt dwSampleLength; /**< @brief sample length */
};
#pragma pack()
#pragma pack(1)
/** @brief WAV 'data' header */
struct WavDataChunk {
RiffChunk chunk;
};
#pragma pack()
static_assert(sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(WavDataChunk) == 44, "WavHeader size is not 44 bytes"); static_assert(sizeof(WavHeaderChunk) + sizeof(WavFormatChunk) + sizeof(WavDataChunk) == 44, "WavHeader size is not 44 bytes");
}} }}

Loading…
Cancel
Save