From 7036bc4ad500a92a4d8f0235649ea80da302df82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 4 Jun 2018 15:37:00 +0200 Subject: [PATCH] Audio: include cleanup. --- src/Magnum/Audio/Audio.h | 2 +- src/Magnum/Audio/Context.h | 16 +++++----------- src/Magnum/Audio/al-info.cpp | 1 - 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Magnum/Audio/Audio.h b/src/Magnum/Audio/Audio.h index d210096f5..6e9e8f1bb 100644 --- a/src/Magnum/Audio/Audio.h +++ b/src/Magnum/Audio/Audio.h @@ -29,7 +29,7 @@ * @brief Forward declarations for the @ref Magnum::Audio namespace */ -#include +#include "Magnum/Types.h" #ifndef DOXYGEN_GENERATING_OUTPUT typedef int ALenum; diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h index df87a83d6..0d03ff6f9 100644 --- a/src/Magnum/Audio/Context.h +++ b/src/Magnum/Audio/Context.h @@ -27,26 +27,20 @@ */ /** @file - * @brief Class @ref Magnum::Audio::Context + * @brief Class @ref Magnum::Audio::Context, macro @ref MAGNUM_ASSERT_AUDIO_EXTENSION_SUPPORTED() */ #include #include -#include #include #include - +#include #include +#include -#include "Magnum/Audio/Audio.h" -#include "Magnum/Audio/Buffer.h" -#include "Magnum/Audio/Extensions.h" +#include "Magnum/Magnum.h" #include "Magnum/Audio/visibility.h" - -#ifndef DOXYGEN_GENERATING_OUTPUT -typedef struct ALCdevice_struct ALCdevice; -typedef struct ALCcontext_struct ALCcontext; -#endif +#include "MagnumExternal/OpenAL/extensions.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/al-info.cpp b/src/Magnum/Audio/al-info.cpp index 007304a76..2c8c0c687 100644 --- a/src/Magnum/Audio/al-info.cpp +++ b/src/Magnum/Audio/al-info.cpp @@ -25,7 +25,6 @@ #include -#include "Magnum/Magnum.h" #include "Magnum/Audio/Context.h" namespace Magnum {