adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux OpenAL changes (not enabled yet)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@306 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-03 22:22:31 +00:00
parent 3900cd1d4d
commit 613e7d9211
1 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/sound/openal/stream.c
+40 -1
View File
@@ -21,6 +21,10 @@
#include "sound.h" #include "sound.h"
#if 0 && !defined (WIN32) // && !defined (MacOS and BEOS too)
#include <AL/alext.h>
#endif
BOOLEAN speech_advancetrack = FALSE; BOOLEAN speech_advancetrack = FALSE;
@@ -49,9 +53,26 @@ PlayStream (TFB_SoundSample *sample, ALuint source, ALboolean looping)
if (decoded_bytes == 0) if (decoded_bytes == 0)
break; break;
#if 0 && !defined (WIN32) // && !defined (MacOS and BeOS too)
// *nix OpenAL implementation has to handle stereo data differently to avoid mixing it to mono
if (sample->decoder->format == AL_FORMAT_STEREO8 ||
sample->decoder->format == AL_FORMAT_STEREO16)
{
alBufferWriteData_LOKI (sample->buffer[i], sample->decoder->format, sample->decoder->buffer,
decoded_bytes, sample->decoder->frequency,
sample->decoder->format);
}
else
{
alBufferData (sample->buffer[i], sample->decoder->format, sample->decoder->buffer,
decoded_bytes, sample->decoder->frequency);
}
#else
alBufferData (sample->buffer[i], sample->decoder->format, sample->decoder->buffer, alBufferData (sample->buffer[i], sample->decoder->format, sample->decoder->buffer,
decoded_bytes, sample->decoder->frequency); decoded_bytes, sample->decoder->frequency);
#endif
alSourceQueueBuffers (soundSource[source].handle, 1, &sample->buffer[i]); alSourceQueueBuffers (soundSource[source].handle, 1, &sample->buffer[i]);
if (sample->decoder->error) if (sample->decoder->error)
@@ -198,9 +219,27 @@ StreamDecoderTaskFunc (void *data)
if (decoded_bytes > 0) if (decoded_bytes > 0)
{ {
#if 0 && !defined (WIN32) // && !defined (MacOS and BeOS too)
// *nix OpenAL implementation has to handle stereo data differently to avoid mixing it to mono
if (soundSource[i].sample->decoder->format == AL_FORMAT_STEREO8 ||
soundSource[i].sample->decoder->format == AL_FORMAT_STEREO16)
{
alBufferWriteData_LOKI (buffer, soundSource[i].sample->decoder->format, soundSource[i].sample->decoder->buffer,
decoded_bytes, soundSource[i].sample->decoder->frequency,
soundSource[i].sample->decoder->format);
}
else
{
alBufferData (buffer, soundSource[i].sample->decoder->format,
soundSource[i].sample->decoder->buffer, decoded_bytes,
soundSource[i].sample->decoder->frequency);
}
#else
alBufferData (buffer, soundSource[i].sample->decoder->format, alBufferData (buffer, soundSource[i].sample->decoder->format,
soundSource[i].sample->decoder->buffer, decoded_bytes, soundSource[i].sample->decoder->buffer, decoded_bytes,
soundSource[i].sample->decoder->frequency); soundSource[i].sample->decoder->frequency);
#endif
if ((error = alGetError()) != AL_NO_ERROR) if ((error = alGetError()) != AL_NO_ERROR)
{ {