aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2007-12-31 01:09:57 -0800
committerChris Robinson <[email protected]>2007-12-31 01:09:57 -0800
commite82c27ab0402fae11811a34b5b44ba4462f35f4e (patch)
tree43da7e1f319944974e3563c820595cfb8d7c9bec /OpenAL32
parentf32098e04d7533782e66f8a06641703383b627b3 (diff)
Fix includes so alMain.h doesn't include so much by itself
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alMain.h10
-rw-r--r--OpenAL32/alBuffer.c1
-rw-r--r--OpenAL32/alSource.c2
3 files changed, 5 insertions, 8 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index c6738868..f2beb30f 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -56,13 +56,7 @@ static inline void DeleteCriticalSection(CRITICAL_SECTION *cs)
#define max(x,y) (((x)>(y))?(x):(y))
#endif
-#include "alBuffer.h"
-#include "alError.h"
-#include "alExtension.h"
#include "alListener.h"
-#include "alSource.h"
-#include "alState.h"
-#include "alThunk.h"
#ifdef __cplusplus
extern "C"
@@ -156,8 +150,8 @@ struct ALCcontext_struct
{
ALlistener Listener;
- ALsource *Source;
- ALuint SourceCount;
+ struct ALsource *Source;
+ ALuint SourceCount;
ALenum LastError;
ALboolean InUse;
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 33db7cfb..13b98b21 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -27,6 +27,7 @@
#include "AL/alc.h"
#include "alError.h"
#include "alBuffer.h"
+#include "alThunk.h"
static void LoadData(ALbuffer *ALBuf, const ALubyte *data, ALsizei size, ALuint freq, ALenum OrigFormat, ALenum NewFormat);
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 7c022e6c..44cd8b41 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -26,6 +26,8 @@
#include "AL/alc.h"
#include "alError.h"
#include "alSource.h"
+#include "alBuffer.h"
+#include "alThunk.h"
static ALvoid InitSourceParams(ALsource *pSource);
static ALboolean GetSourceOffset(ALsource *pSource, ALenum eName, ALfloat *pflOffset);