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

commond decoders for OpenAL and MixSDL

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@597 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-01-29 20:23:12 +00:00
parent ba72fae745
commit 3c9b61fddc
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/sound/Makeinfo
+2 -2
View File
@@ -1,8 +1,8 @@
if [ "$uqm_SOUNDMODULE" = openal ]; then if [ "$uqm_SOUNDMODULE" = openal ]; then
uqm_SUBDIRS="openal" uqm_SUBDIRS="openal decoders"
uqm_CFLAGS="$uqm_CFLAGS -DSOUNDMODULE_OPENAL" uqm_CFLAGS="$uqm_CFLAGS -DSOUNDMODULE_OPENAL"
elif [ "$uqm_SOUNDMODULE" = mixsdl ]; then elif [ "$uqm_SOUNDMODULE" = mixsdl ]; then
uqm_SUBDIRS="mixsdl" uqm_SUBDIRS="mixsdl decoders"
uqm_CFLAGS="$uqm_CFLAGS -DSOUNDMODULE_MIXSDL" uqm_CFLAGS="$uqm_CFLAGS -DSOUNDMODULE_MIXSDL"
else else
uqm_SUBDIRS="sdl" uqm_SUBDIRS="sdl"
sc2/src/sc2code/libs/sound/mixsdl/Makeinfo
-1
View File
@@ -1,2 +1 @@
uqm_SUBDIRS="decoders"
uqm_CFILES="mixer.c sound.c music.c sfx.c stream.c trackplayer.c" uqm_CFILES="mixer.c sound.c music.c sfx.c stream.c trackplayer.c"
sc2/src/sc2code/libs/sound/mixsdl/sound.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "libs/sound/sndintrn.h" #include "libs/sound/sndintrn.h"
#include "libs/sound/sound_common.h" #include "libs/sound/sound_common.h"
#include "mixer.h" #include "mixer.h"
#include "decoders/decoder.h" #include "libs/sound/decoders/decoder.h"
#define FIRST_SFX_SOURCE 0 #define FIRST_SFX_SOURCE 0
sc2/src/sc2code/libs/sound/openal/Makeinfo
-1
View File
@@ -1,2 +1 @@
uqm_SUBDIRS="decoders"
uqm_CFILES="music.c sfx.c sound.c stream.c trackplayer.c" uqm_CFILES="music.c sfx.c sound.c stream.c trackplayer.c"
sc2/src/sc2code/libs/sound/openal/sound.c
+7 -1
View File
@@ -34,6 +34,12 @@ int
TFB_InitSound (int driver, int flags) TFB_InitSound (int driver, int flags)
{ {
int i; int i;
TFB_DecoderFormats formats =
{
MIX_IS_BIG_ENDIAN, MIX_WANT_BIG_ENDIAN,
AL_FORMAT_MONO8, AL_FORMAT_STEREO8,
AL_FORMAT_MONO16, AL_FORMAT_STEREO16
};
fprintf (stderr, "Initializing OpenAL.\n"); fprintf (stderr, "Initializing OpenAL.\n");
atexit (TFB_UninitSound); atexit (TFB_UninitSound);
@@ -67,7 +73,7 @@ TFB_InitSound (int driver, int flags)
//fprintf (stderr, " extensions: %s\n", alGetString (AL_EXTENSIONS)); //fprintf (stderr, " extensions: %s\n", alGetString (AL_EXTENSIONS));
fprintf (stderr, "Initializing sound decoders.\n"); fprintf (stderr, "Initializing sound decoders.\n");
SoundDecoder_Init (flags); SoundDecoder_Init (flags, &formats);
fprintf (stderr, "Sound decoders initialized.\n"); fprintf (stderr, "Sound decoders initialized.\n");
alListenerfv (AL_POSITION, listenerPos); alListenerfv (AL_POSITION, listenerPos);
sc2/src/sc2code/libs/sound/openal/sound.h
+2 -1
View File
@@ -31,7 +31,8 @@
#include "libs/strings/strintrn.h" #include "libs/strings/strintrn.h"
#include "libs/sound/sndintrn.h" #include "libs/sound/sndintrn.h"
#include "libs/sound/sound_common.h" #include "libs/sound/sound_common.h"
#include "decoders/decoder.h" #include "mixer.h"
#include "libs/sound/decoders/decoder.h"
#define FIRST_SFX_SOURCE 0 #define FIRST_SFX_SOURCE 0