aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/alcReverb.c5
-rw-r--r--OpenAL32/Include/alAuxEffectSlot.h18
-rw-r--r--OpenAL32/Include/alBuffer.h2
-rw-r--r--OpenAL32/Include/alEffect.h2
-rw-r--r--OpenAL32/Include/alError.h3
-rw-r--r--OpenAL32/Include/alFilter.h3
-rw-r--r--OpenAL32/Include/alListener.h2
-rw-r--r--OpenAL32/Include/alMain.h34
-rw-r--r--OpenAL32/Include/alSource.h4
-rw-r--r--OpenAL32/Include/alu.h12
-rw-r--r--OpenAL32/alFilter.c3
11 files changed, 40 insertions, 48 deletions
diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c
index 7fe28fa9..bc06fd66 100644
--- a/Alc/alcReverb.c
+++ b/Alc/alcReverb.c
@@ -24,13 +24,12 @@
#include <stdlib.h>
#include <math.h>
-#include "AL/al.h"
-#include "AL/alc.h"
#include "alMain.h"
+#include "alu.h"
#include "alAuxEffectSlot.h"
#include "alEffect.h"
+#include "alFilter.h"
#include "alError.h"
-#include "alu.h"
typedef struct DelayLine
{
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index d1b00e37..f025118f 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -1,15 +1,20 @@
#ifndef _AL_AUXEFFECTSLOT_H_
#define _AL_AUXEFFECTSLOT_H_
-#include "AL/al.h"
+#include "alMain.h"
#include "alEffect.h"
-#include "alFilter.h"
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct ALeffectState ALeffectState;
+typedef struct ALeffectState {
+ ALvoid (*Destroy)(struct ALeffectState *State);
+ ALboolean (*DeviceUpdate)(struct ALeffectState *State, ALCdevice *Device);
+ ALvoid (*Update)(struct ALeffectState *State, ALCdevice *Device, const struct ALeffectslot *Slot);
+ ALvoid (*Process)(struct ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[BUFFERSIZE]);
+} ALeffectState;
+
typedef struct ALeffectslot
{
@@ -36,13 +41,6 @@ typedef struct ALeffectslot
ALenum InitEffectSlot(ALeffectslot *slot);
ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context);
-struct ALeffectState {
- ALvoid (*Destroy)(ALeffectState *State);
- ALboolean (*DeviceUpdate)(ALeffectState *State, ALCdevice *Device);
- ALvoid (*Update)(ALeffectState *State, ALCdevice *Device, const ALeffectslot *Slot);
- ALvoid (*Process)(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[BUFFERSIZE]);
-};
-
ALeffectState *NoneCreate(void);
ALeffectState *ReverbCreate(void);
ALeffectState *EchoCreate(void);
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h
index d7f4206a..8ecc4dd8 100644
--- a/OpenAL32/Include/alBuffer.h
+++ b/OpenAL32/Include/alBuffer.h
@@ -1,7 +1,7 @@
#ifndef _AL_BUFFER_H_
#define _AL_BUFFER_H_
-#include "AL/al.h"
+#include "alMain.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index dfe0a2a8..ba894c8b 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -1,7 +1,7 @@
#ifndef _AL_EFFECT_H_
#define _AL_EFFECT_H_
-#include "AL/al.h"
+#include "alMain.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alError.h b/OpenAL32/Include/alError.h
index f3a9c12d..0ade342d 100644
--- a/OpenAL32/Include/alError.h
+++ b/OpenAL32/Include/alError.h
@@ -1,8 +1,7 @@
#ifndef _AL_ERROR_H_
#define _AL_ERROR_H_
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alMain.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alFilter.h b/OpenAL32/Include/alFilter.h
index c871e6dc..02ce5c3b 100644
--- a/OpenAL32/Include/alFilter.h
+++ b/OpenAL32/Include/alFilter.h
@@ -1,8 +1,7 @@
#ifndef _AL_FILTER_H_
#define _AL_FILTER_H_
-#include "AL/al.h"
-#include "alu.h"
+#include "alMain.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index 0e69f6c5..e25807c4 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -1,7 +1,7 @@
#ifndef _AL_LISTENER_H_
#define _AL_LISTENER_H_
-#include "AL/al.h"
+#include "alMain.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index a18da7e4..3bfb0046 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -514,6 +514,26 @@ void alc_loopback_deinit(void);
void alc_loopback_probe(enum DevProbe type);
+enum DistanceModel {
+ InverseDistanceClamped = AL_INVERSE_DISTANCE_CLAMPED,
+ LinearDistanceClamped = AL_LINEAR_DISTANCE_CLAMPED,
+ ExponentDistanceClamped = AL_EXPONENT_DISTANCE_CLAMPED,
+ InverseDistance = AL_INVERSE_DISTANCE,
+ LinearDistance = AL_LINEAR_DISTANCE,
+ ExponentDistance = AL_EXPONENT_DISTANCE,
+ DisableDistance = AL_NONE,
+
+ DefaultDistanceModel = InverseDistanceClamped
+};
+
+enum Resampler {
+ PointResampler,
+ LinearResampler,
+ CubicResampler,
+
+ ResamplerMax,
+};
+
enum Channel {
FrontLeft = 0,
FrontRight,
@@ -528,6 +548,7 @@ enum Channel {
MaxChannels,
};
+
/* Device formats */
enum DevFmtType {
DevFmtByte = ALC_BYTE_SOFT,
@@ -700,19 +721,6 @@ struct ALCdevice_struct
#define RemoveFilter(m, k) ((struct ALfilter*)RemoveUIntMapKey(&(m)->FilterMap, (k)))
-enum DistanceModel {
- InverseDistanceClamped = AL_INVERSE_DISTANCE_CLAMPED,
- LinearDistanceClamped = AL_LINEAR_DISTANCE_CLAMPED,
- ExponentDistanceClamped = AL_EXPONENT_DISTANCE_CLAMPED,
- InverseDistance = AL_INVERSE_DISTANCE,
- LinearDistance = AL_LINEAR_DISTANCE,
- ExponentDistance = AL_EXPONENT_DISTANCE,
- DisableDistance = AL_NONE,
-
- DefaultDistanceModel = InverseDistanceClamped
-};
-
-
struct ALCcontext_struct
{
volatile RefCount ref;
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index ace0b5b5..c9832e47 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -3,9 +3,9 @@
#define MAX_SENDS 4
-#include "alFilter.h"
+#include "alMain.h"
#include "alu.h"
-#include "AL/al.h"
+#include "alFilter.h"
#ifdef __cplusplus
extern "C" {
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 6e29e7bf..5e46dec1 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -1,9 +1,7 @@
#ifndef _ALU_H_
#define _ALU_H_
-#include "AL/al.h"
-#include "AL/alc.h"
-#include "AL/alext.h"
+#include "alMain.h"
#include <limits.h>
#include <math.h>
@@ -92,14 +90,6 @@ typedef ALvoid (*WetMixerFunc)(struct SendParams *params,
ALuint OutPos, ALuint SamplesToDo,
ALuint BufferSize);
-enum Resampler {
- PointResampler,
- LinearResampler,
- CubicResampler,
-
- ResamplerMax,
-};
-
#define FRACTIONBITS (14)
#define FRACTIONONE (1<<FRACTIONBITS)
diff --git a/OpenAL32/alFilter.c b/OpenAL32/alFilter.c
index 1250693e..a03ee2d8 100644
--- a/OpenAL32/alFilter.c
+++ b/OpenAL32/alFilter.c
@@ -22,9 +22,8 @@
#include <stdlib.h>
-#include "AL/al.h"
-#include "AL/alc.h"
#include "alMain.h"
+#include "alu.h"
#include "alFilter.h"
#include "alThunk.h"
#include "alError.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 20:41:27 +0000