From 7adac511523ae173ef018c9ca9d20778b4e6abc3 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 4 Jan 2021 20:11:04 +0200 Subject: Handle stereo panning in OAL manually for streams --- src/audio/oal/stream.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/audio/oal/stream.h') diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h index 2476abcc..befcd0ab 100644 --- a/src/audio/oal/stream.h +++ b/src/audio/oal/stream.h @@ -57,7 +57,7 @@ public: class CStream { char m_aFilename[128]; - ALuint &m_alSource; + ALuint *m_pAlSources; ALuint (&m_alBuffers)[NUM_STREAMBUFFERS]; bool m_bPaused; @@ -73,20 +73,20 @@ class CStream IDecoder *m_pSoundFile; bool HasSource(); - void SetPosition(float x, float y, float z); + void SetPosition(int i, float x, float y, float z); void SetPitch(float pitch); void SetGain(float gain); void Pause(); void SetPlay(bool state); - bool FillBuffer(ALuint alBuffer); + bool FillBuffer(ALuint *alBuffer); int32 FillBuffers(); void ClearBuffers(); public: static void Initialise(); static void Terminate(); - CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUFFERS]); + CStream(char *filename, ALuint *sources, ALuint (&buffers)[NUM_STREAMBUFFERS]); ~CStream(); void Delete(); -- cgit v1.2.3 From a346461ea8155e0c038cf05883ddb1159247de50 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 4 Jan 2021 22:27:32 +0200 Subject: Increase number of stream buffers, plus ALStreamSources fix --- src/audio/oal/stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio/oal/stream.h') diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h index befcd0ab..326ce6a1 100644 --- a/src/audio/oal/stream.h +++ b/src/audio/oal/stream.h @@ -3,7 +3,7 @@ #ifdef AUDIO_OAL #include -#define NUM_STREAMBUFFERS 4 +#define NUM_STREAMBUFFERS 8 class IDecoder { -- cgit v1.2.3 From bc363a74f59806db32080393c696269277dd93f9 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 Jan 2021 21:06:17 +0200 Subject: Add support of PS2 audio streams to OpenAL --- src/audio/oal/stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio/oal/stream.h') diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h index 326ce6a1..bcbc5e54 100644 --- a/src/audio/oal/stream.h +++ b/src/audio/oal/stream.h @@ -86,7 +86,7 @@ public: static void Initialise(); static void Terminate(); - CStream(char *filename, ALuint *sources, ALuint (&buffers)[NUM_STREAMBUFFERS]); + CStream(char *filename, ALuint *sources, ALuint (&buffers)[NUM_STREAMBUFFERS], uint32 overrideSampleRate = 32000); ~CStream(); void Delete(); -- cgit v1.2.3