--- a/CMakeLists.txt Fri Oct 16 15:56:42 2009 +0000
+++ b/CMakeLists.txt Fri Oct 16 16:42:51 2009 +0000
@@ -69,7 +69,7 @@
#set default flags values for all the project
set(CMAKE_C_FLAGS "-Wall -pipe")
set(CMAKE_C_FLAGS_RELEASE "-w -O2 -fomit-frame-pointer")
-set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG")
if(APPLE AND NOT universal_build)
set(CMAKE_C_FLAGS_RELEASE "-msse2 ${CMAKE_C_FLAGS_RELEASE}")
endif()
--- a/QTfrontend/SDLs.cpp Fri Oct 16 15:56:42 2009 +0000
+++ b/QTfrontend/SDLs.cpp Fri Oct 16 16:42:51 2009 +0000
@@ -171,11 +171,12 @@
}
oalb_playsound(music, 1);
oalb_setvolume(music, 60);
+ oalb_fadein(music, 50);
}
void SDLInteraction::StopMusic()
{
-// if (music >= 0) openal_fadeout(music, 40);
+ if (music >= 0) oalb_fadeout(music, 20);
oalb_stopsound(music);
}
--- a/hedgewars/CMakeLists.txt Fri Oct 16 15:56:42 2009 +0000
+++ b/hedgewars/CMakeLists.txt Fri Oct 16 16:42:51 2009 +0000
@@ -100,7 +100,7 @@
set(pascal_compiler_flags "-fPIC" "-CfSSE2" ${pascal_compiler_flags}) #instruction set for ppc is 7400
endif()
else(OPTIMIZATIONS)
- set(pascal_compiler_flags "-O-" "-gl" "-dDEBUGFILE" "-pg" "-va" ${pascal_compiler_flags})
+ set(pascal_compiler_flags "-O-" "-gl" "-dDEBUGFILE" "-dDEBUG" "-pg" "-va" ${pascal_compiler_flags})
endif(OPTIMIZATIONS)
if(LOWRES)
--- a/hedgewars/uSound.pas Fri Oct 16 15:56:42 2009 +0000
+++ b/hedgewars/uSound.pas Fri Oct 16 16:42:51 2009 +0000
@@ -58,15 +58,18 @@
function AskForVoicepack(name: shortstring): PVoicepack;
function soundFadeOut(snd: TSound; qt: LongInt; voicepack: PVoicepack): LongInt;
-function oalb_init(const app: PChar; const usehardware: Byte): Byte; cdecl; external OpenALBridge;
+
procedure oalb_close; cdecl; external OpenALBridge;
-function oalb_loadfile(const filename: PChar): LongInt; cdecl; external OpenALBridge;
-procedure oalb_playsound(const idx: LongInt; const loop: Byte); cdecl; external OpenALBridge;
-procedure oalb_stopsound(const idx: LongInt); cdecl; external OpenALBridge;
-procedure oalb_pausesound(const idx: LongInt); cdecl; external OpenALBridge;
-procedure oalb_continuesound(const idx: LongInt); cdecl; external OpenALBridge;
-procedure oalb_setvolume(const idx: LongInt; const percentage: Byte); cdecl; external OpenALBridge;
-procedure oalb_setglobalvolume(const percentage: Byte); cdecl; external OpenALBridge;
+function oalb_init (const app: PChar; const usehardware: Byte): Byte; cdecl; external OpenALBridge;
+function oalb_loadfile (const filename: PChar): LongInt; cdecl; external OpenALBridge;
+procedure oalb_playsound (const idx: LongInt; const loop: Byte); cdecl; external OpenALBridge;
+procedure oalb_stopsound (const idx: LongInt); cdecl; external OpenALBridge;
+procedure oalb_pausesound (const idx: LongInt); cdecl; external OpenALBridge;
+procedure oalb_continuesound (const idx: LongInt); cdecl; external OpenALBridge;
+procedure oalb_setvolume (const idx: LongInt; const percentage: Byte); cdecl; external OpenALBridge;
+procedure oalb_setglobalvolume (const percentage: Byte); cdecl; external OpenALBridge;
+procedure oalb_fadein (const idx: LongInt; quantity: Integer); cdecl; external OpenALBridge;
+procedure oalb_fadeout (const idx: LongInt; quantity: Integer); cdecl; external OpenALBridge;
var MusicFN: shortstring = '';
@@ -103,7 +106,7 @@
or if ogg are loaded in stream or if sound is loaded by demand*}
WriteToConsole('Init OpenAL sound...');
-isSoundEnabled:= oalb_init('hwengine', Byte(isSoundHardware)) = 1;
+isSoundEnabled:= oalb_init(str2PChar(ParamStr(0)), Byte(isSoundHardware)) = 1;
if isSoundEnabled then WriteLnToConsole(msgOK)
else WriteLnToConsole(msgFailed);
@@ -113,7 +116,7 @@
procedure ReleaseSound;
begin
-//if isMusicEnabled then openal_fadeout(Mus, 30);
+if isMusicEnabled then oalb_fadeout(Mus, 30);
oalb_close();
end;
@@ -154,8 +157,8 @@
function soundFadeOut(snd: TSound; qt: LongInt; voicepack: PVoicepack): LongInt;
begin
if not isSoundEnabled then exit(0);
-//if (voicepack <> nil) and (voicepack^.chunks[snd] >= 0) then openal_fadeout(defVoicepack^.chunks[snd], qt)
-//else if (defVoicepack^.chunks[snd] >= 0) then openal_fadeout(defVoicepack^.chunks[snd], qt);
+if (voicepack <> nil) and (voicepack^.chunks[snd] >= 0) then oalb_fadeout(defVoicepack^.chunks[snd], qt)
+else if (defVoicepack^.chunks[snd] >= 0) then oalb_fadeout(defVoicepack^.chunks[snd], qt);
end;
procedure PlaySound(snd: TSound; infinite: boolean; voicepack: PVoicepack);
@@ -191,9 +194,8 @@
TryDo(Mus >= 0, msgFailed, false);
WriteLnToConsole(msgOK);
-//openal_fadein(Mus, 20);
-//openal_toggleloop(Mus);
oalb_playsound(Mus, 1);
+oalb_fadein(Mus, 50);
end;
function ChangeVolume(voldelta: LongInt): LongInt;
--- a/openalbridge/CMakeLists.txt Fri Oct 16 15:56:42 2009 +0000
+++ b/openalbridge/CMakeLists.txt Fri Oct 16 16:42:51 2009 +0000
@@ -8,7 +8,7 @@
#list of source files for libraries
set(openal_src
- openalbridge.c loaders.c wrappers.c errlib.c ssound.c
+ openalbridge.c loaders.c wrappers.c errlib.c
)
#build a static library for human systems
@@ -18,7 +18,7 @@
if(WIN32)
#workaround for visualstudio (wants headers in the source list)
set(openal_src
- openalbridge.h loaders.h wrappers.h common.h oggvorbis.h errlib.h ssound.h ${openal_src}
+ openalbridge.h loaders.h wrappers.h common.h oggvorbis.h errlib.h ${openal_src}
)
#deps for the shared library
link_libraries(${VORBISFILE_LIBRARY})
--- a/openalbridge/common.h Fri Oct 16 15:56:42 2009 +0000
+++ b/openalbridge/common.h Fri Oct 16 16:42:51 2009 +0000
@@ -18,8 +18,8 @@
*/
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef _COMMON_H
+#define _COMMON_H
#include <stdio.h>
#include <stdlib.h>
@@ -124,11 +124,22 @@
#pragma pack(1)
typedef struct _SSound_t {
- int source;
- char Filename[256];
+ int isLoaded;
+ int sourceIndex;
+ char *filename;
ALuint Buffer;
} SSound_t;
#pragma pack()
-#endif
+/*data type for passing data between threads*/
+#pragma pack(1)
+typedef struct _fade_t {
+ uint32_t index;
+ uint16_t quantity;
+} fade_t;
+#pragma pack()
+#define FADE_IN 0
+#define FADE_OUT 1
+
+#endif /* _COMMON_H*/
--- a/openalbridge/openalbridge.c Fri Oct 16 15:56:42 2009 +0000
+++ b/openalbridge/openalbridge.c Fri Oct 16 16:42:51 2009 +0000
@@ -1,7 +1,6 @@
/*
* OpenAL Bridge - a simple portable library for OpenAL interface
- * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>,
- * Mario Liebisch <mario.liebisch+hw@googlemail.com>
+ * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -19,29 +18,17 @@
#include "openalbridge.h"
-
+char oalbReady = 0;
+int iNumSounds = 0;
char *prog;
-
-/*Buffers hold sound data*/
-ALuint *Buffers;
-/*index for Sources and Buffers*/
-ALuint globalindex, globalsize, increment;
+/*Sources are points emitting sound*/
+ALuint Sources[MAX_SOURCES];
-//null vector
-const ALfloat NV[] = {0.0f, 0.0f, 0.0f};
-//listener orientation
-const ALfloat LO[] = {0.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f};
+/*structure that holds information about sounds*/
+SSound_t *theSounds;
-SSound_t aSounds[MAX_SOUNDS];
-int iNumSounds = 0;
-char oalbReady = 0;
-
-ALCcontext *context;
-ALCdevice *device;
-ALuint sources[MAX_SOURCES];
-
-
-
+ALfloat SourcePos[] = { 0.0, 0.0, 0.0 }; /*Position of the source sound*/
+ALfloat SourceVel[] = { 0.0, 0.0, 0.0 }; /*Velocity of the source sound*/
/**
* const char oalb_init (const char* programname, const char usehardware)
@@ -56,10 +43,23 @@
* 2 error
*/
-const char oalb_init (const char* programname, const char usehardware) {
+const char oalb_init (const char* programname, const char usehardware) {
+ /*Initialize an OpenAL contex and allocate memory space for data and buffers*/
+ ALCcontext *context;
+ ALCdevice *device;
+ const ALCchar *default_device;
+ int i;
+
prog = (char *) programname;
- if (oalbReady == AL_TRUE) {
+ /*Position of the listener*/
+ ALfloat ListenerPos[] = {0.0, 0.0, 0.0};
+ /*Velocity of the listener*/
+ ALfloat ListenerVel[] = {0.0, 0.0, 0.0};
+ /*Orientation of the listener. (first 3 elements are "at", second 3 are "up")*/
+ ALfloat ListenerOri[] = {0.0, 0.0, -1.0, 0.0, 1.0, 0.0};
+
+ if (oalbReady == 1) {
errno = EPERM;
err_ret("(%s) WARN - OpenAL already initialized", prog);
return AL_FALSE;
@@ -88,29 +88,32 @@
err_ret("(%s) WARN - Failed to open sound device", prog);
return AL_FALSE;
}
-
- err_msg("(%s) INFO - Using OpenAL device: %s", prog, alcGetString(device, ALC_DEVICE_SPECIFIER));
+ err_msg("(%s) INFO - Output device: %s", prog, alcGetString(device, ALC_DEVICE_SPECIFIER));
context = alcCreateContext(device, NULL);
alcMakeContextCurrent(context);
+ alcProcessContext(context);
- if (AlGetError("(%s) WARN - Failed to create a new contex") != AL_TRUE)
+ if (AlGetError("(%s) ERROR - Failed to create a new contex") != AL_TRUE)
return AL_FALSE;
/*set the listener gain, position (on xyz axes), velocity (one value for each axe) and orientation*/
- alListenerf (AL_GAIN, 1.0f);
- alListenerfv(AL_POSITION, NV);
- alListenerfv(AL_VELOCITY, NV);
- alListenerfv(AL_ORIENTATION, LO);
-
- alcProcessContext(context);
+ alListenerf (AL_GAIN, 1.0f );
+ alListenerfv(AL_POSITION, ListenerPos);
+ alListenerfv(AL_VELOCITY, ListenerVel);
+ alListenerfv(AL_ORIENTATION, ListenerOri);
if (AlGetError("(%s) WARN - Failed to set Listener properties") != AL_TRUE)
return AL_FALSE;
- alGenSources(MAX_SOURCES, sources);
+ theSounds = (SSound_t*) Malloc(sizeof(SSound_t)*MAX_SOUNDS);
+ for (i = 0; i < MAX_SOUNDS; i++) {
+ theSounds->isLoaded = 0;
+ theSounds->sourceIndex = -1;
+ }
- oalbReady = AL_TRUE;
+ alGenSources(MAX_SOURCES, Sources);
+ oalbReady = 1;
alGetError(); /* clear any AL errors beforehand */
return AL_TRUE;
@@ -129,6 +132,9 @@
*/
void oalb_close (void) {
+ /*Stop all sounds, deallocate all memory and close OpenAL */
+ ALCcontext *context;
+ ALCdevice *device;
int i;
if (oalbReady == 0) {
@@ -137,13 +143,17 @@
return;
}
- for(i = 0; i < iNumSounds; i++) {
- SSound_stop(&aSounds[i]);
- SSound_close(&aSounds[i]);
+ alSourceStopv (MAX_SOURCES, Sources);
+ alDeleteSources (MAX_SOURCES, Sources);
+
+ for (i = 0; i < MAX_SOUNDS; i++) {
+ free(theSounds[i].filename);
+ alDeleteBuffers (1, &theSounds[i].Buffer);
}
+ free(theSounds);
- alSourceStopv (MAX_SOURCES, sources);
- alDeleteSources (MAX_SOURCES, sources);
+ context = alcGetCurrentContext();
+ device = alcGetContextsDevice(context);
alcMakeContextCurrent(NULL);
alcDestroyContext(context);
@@ -168,6 +178,21 @@
char oalb_ready (void) {
return oalbReady;
}
+/*
+ ALboolean helper_realloc (void) {
+ expands allocated memory when loading more sound files than expected
+ int oldsize = globalsize;
+ globalsize += increment;
+
+ #ifdef DEBUG
+ err_msg("(%s) INFO - Realloc in process from %d to %d\n", prog, oldsize, globalsize);
+ #endif
+
+ Buffers = (ALuint*) Realloc(Buffers, sizeof(ALuint)*globalsize);
+ Sources = (ALuint*) Realloc(Sources, sizeof(ALuint)*globalsize);
+
+ return AL_TRUE;
+ }*/
/**
* const int32_t oalb_loadfile (const char *filename)
@@ -180,8 +205,15 @@
* -
*/
-const int32_t oalb_loadfile (const char *filename) {
- int i;
+const int32_t oalb_loadfile (const char *filename){
+ /*Open a file, load into memory and allocate the Source buffer for playing*/
+
+ ALenum format, error;
+ ALsizei bitsize, freq;
+ char *data;
+ int namelength, i;
+ uint32_t magic;
+ FILE *fp;
if (oalbReady == 0) {
errno = EPERM;
@@ -189,25 +221,79 @@
return -1;
}
- if(iNumSounds == MAX_SOUNDS) {
- err_msg("(%s) WARN - Maximum number of sound samples reached", prog);
- return -3;
+ /*when the buffers are all used, we can expand memory to accept new files*/
+ // if (globalindex == globalsize)
+ // helper_realloc();
+
+ namelength=strlen(filename);
+ /*if this sound is already loaded return the index from theSounds*/
+ for (i = 0; i < iNumSounds; i++){
+ if (theSounds[iNumSounds].isLoaded == 1) {
+ if (strncmp(theSounds[iNumSounds].filename, filename, namelength) == 0)
+ return i;
+ }
+ }
+
+ /*else load it and store it into a theSounds cell*/
+
+ /*detect the file format, as written in the first 4 bytes of the header*/
+ fp = Fopen (filename, "rb");
+
+ if (fp == NULL)
+ return -1;
+
+ error = fread (&magic, sizeof(uint32_t), 1, fp);
+ fclose (fp);
+
+ if (error < 0) {
+ errno = EIO;
+ err_ret("(%s) ERROR - File %s is too short", prog, filename);
+ return -2;
}
+ switch (ENDIAN_BIG_32(magic)) {
+ case OGG_FILE_FORMAT:
+ error = load_oggvorbis (filename, &format, &data, &bitsize, &freq);
+ break;
+ case WAV_FILE_FORMAT:
+ error = load_wavpcm (filename, &format, &data, &bitsize, &freq);
+ break;
+ default:
+ errno = EINVAL;
+ err_ret ("(%s) ERROR - File format (%08X) not supported", prog, ENDIAN_BIG_32(magic));
+ return -5;
+ break;
+ }
- for(i = 0; i < iNumSounds; i++)
- if(strcmp(aSounds[i].Filename, filename) == 0)
- return i;
+ theSounds[iNumSounds].filename = (char*) Malloc(sizeof(char) * namelength);
+ strncpy(theSounds[iNumSounds].filename, filename, namelength);
+ theSounds[iNumSounds].isLoaded = 1;
- if(SSound_load(&aSounds[iNumSounds], filename))
- return iNumSounds++;
- else
- return -2;
+ /*prepare the buffer to receive data*/
+ alGenBuffers(1, &theSounds[iNumSounds].Buffer);
+
+ if (AlGetError("(%s) ERROR - Failed to allocate memory for buffers") != AL_TRUE)
+ return -3;
+ /*copy pcm data in one buffer*/
+ alBufferData(theSounds[iNumSounds].Buffer, format, data, bitsize, freq);
+ /*deallocate data to save memory*/
+ free(data);
+
+ if (AlGetError("(%s) ERROR - Failed to write data to buffers") != AL_TRUE)
+ return -6;
+
+ alGetError(); /* clear any AL errors beforehand */
+
+ /*returns the index of the source you just loaded, increments it and exits*/
+ return iNumSounds++;
}
+
void oalb_setvolume (const uint32_t iIndex, const char cPercentage) {
+ float percentage;
+
if (oalbReady == 0) {
errno = EPERM;
err_ret("(%s) WARN - OpenAL not initialized", prog);
@@ -222,9 +308,11 @@
}
if(cPercentage > 100)
- SSound_volume(&aSounds[iIndex], 1.0f);
+ percentage = 1.0f;
else
- SSound_volume(&aSounds[iIndex], cPercentage / 100.0f);
+ percentage = cPercentage / 100.0f;
+
+ alSourcef(Sources[theSounds[iIndex].sourceIndex], AL_GAIN, percentage);
if (AlGetError2("(%s) ERROR - Failed to set volume for sound %d\n", iIndex) != AL_TRUE)
return;
@@ -235,6 +323,7 @@
}
+
void oalb_setglobalvolume (const char cPercentage) {
if (oalbReady == 0) {
errno = EPERM;
@@ -256,7 +345,6 @@
return;
}
-
void oalb_togglemute (void) {
/*Mute or unmute sound*/
ALfloat mute;
@@ -282,81 +370,83 @@
return;
}
- /*
-
- ALboolean openal_fade (uint32_t index, uint16_t quantity, ALboolean direction) {
- /*Fade in or out by calling a helper thread
- #ifndef _WIN32
- pthread_t thread;
- #else
- HANDLE Thread;
- DWORD threadID;
- #endif
- fade_t *fade;
-
- if (oalbReady == AL_FALSE) {
- errno = EPERM;
- err_ret("(%s) WARN - OpenAL not initialized", prog);
- return AL_FALSE;
- }
-
- fade = (fade_t*) Malloc(sizeof(fade_t));
- fade->index = index;
- fade->quantity = quantity;
-
- if (index >= globalsize) {
- errno = EINVAL;
- err_ret("(%s) ERROR - Index out of bounds (got %d, max %d)", prog, index, globalindex);
- return AL_FALSE;
- }
+
+
+void oalb_fade (uint32_t iIndex, uint16_t quantity, ALboolean direction) {
+ /*Fade in or out by calling a helper thread*/
+#ifndef _WIN32
+ pthread_t thread;
+#else
+ HANDLE Thread;
+ DWORD threadID;
+#endif
+ fade_t *fade;
+
+ if (oalbReady == 0) {
+ errno = EPERM;
+ err_ret("(%s) WARN - OpenAL not initialized", prog);
+ return ;
+ }
+
+ fade = (fade_t*) Malloc(sizeof(fade_t));
+ fade->index = iIndex;
+ fade->quantity = quantity;
+
+ if(iIndex < 0 || iIndex >= iNumSounds) {
+ errno = EINVAL;
+ err_ret("(%s) ERROR - Index (%d) out of bounds", prog, iIndex);
+ return;
+ }
+
+ switch (direction) {
+ case FADE_IN:
+#ifndef _WIN32
+ pthread_create(&thread, NULL, helper_fadein, (void*) fade);
+#else
+ Thread = _beginthread(&helper_fadein, 0, (void*) fade);
+#endif
+ break;
+ case FADE_OUT:
+#ifndef _WIN32
+ pthread_create(&thread, NULL, helper_fadeout, (void*) fade);
+#else
+ Thread = _beginthread(&helper_fadeout, 0, (void*) fade);
+#endif
+ break;
+ default:
+ errno = EINVAL;
+ err_ret("(%s) ERROR - Unknown direction for fading", prog, index);
+ free(fade);
+ return;
+ break;
+ }
+
+#ifndef _WIN32
+ pthread_detach(thread);
+#endif
+
+ alGetError(); /* clear any AL errors beforehand */
+
+ return;
+}
+
+
+void oalb_fadeout (uint32_t index, uint16_t quantity) {
+ /*wrapper for fadeout*/
+ oalb_fade(index, quantity, FADE_OUT);
+ return;
+}
+
+
+void oalb_fadein (uint32_t index, uint16_t quantity) {
+ /*wrapper for fadein*/
+ oalb_fade(index, quantity, FADE_IN);
+ return;
+}
- switch (direction) {
- case FADE_IN:
- #ifndef _WIN32
- pthread_create(&thread, NULL, helper_fadein, (void*) fade);
- #else
- Thread = _beginthread(&helper_fadein, 0, (void*) fade);
- #endif
- break;
- case FADE_OUT:
- #ifndef _WIN32
- pthread_create(&thread, NULL, helper_fadeout, (void*) fade);
- #else
- Thread = _beginthread(&helper_fadeout, 0, (void*) fade);
- #endif
- break;
- default:
- errno = EINVAL;
- err_ret("(%s) ERROR - Unknown direction for fading", prog, index, globalindex);
- free(fade);
- return AL_FALSE;
- break;
- }
-
- #ifndef _WIN32
- pthread_detach(thread);
- #endif
-
- alGetError(); /* clear any AL errors beforehand
-
- return AL_TRUE;
- }
-
-
- ALboolean openal_fadeout (uint32_t index, uint16_t quantity) {
- /*wrapper for fadeout
- return openal_fade(index, quantity, FADE_OUT);
- }
-
-
- ALboolean openal_fadein (uint32_t index, uint16_t quantity) {
- /*wrapper for fadein
- return openal_fade(index, quantity, FADE_IN);
- }
-
-
- ALboolean openal_setposition (uint32_t index, float x, float y, float z) {
- if (oalbReady == AL_FALSE) {
+
+/* ALboolean openal_setposition (uint32_t index, float x, float y, float z) {
+ if (openalReady == AL_FALSE) {
errno = EPERM;
err_ret("(%s) WARN - OpenAL not initialized", prog);
return AL_FALSE;
@@ -373,12 +463,14 @@
return AL_FALSE;
return AL_TRUE;
- }
-
- */
+ }*/
+
-void oalb_playsound (const uint32_t iIndex, const char bLoop) {
- if (oalbReady == AL_FALSE) {
+void oalb_playsound (const uint32_t iIndex, const char bLoop){
+ int findNewSource;
+ int i, j, state;
+
+ if (oalbReady == 0) {
errno = EPERM;
err_ret("(%s) WARN - OpenAL not initialized", prog);
return;
@@ -390,9 +482,55 @@
err_ret("(%s) ERROR - Index (%d) out of bounds", prog, iIndex);
return;
}
- SSound_play(&aSounds[iIndex], bLoop);
+
+ /*check if sound has already a source*/
+ if (theSounds[iIndex].sourceIndex == -1) {
+ /*needs a new source*/
+ findNewSource = 1;
+ } else {
+ /*already has a source -- check it's not playing*/
+ alGetSourcei(Sources[theSounds[iIndex].sourceIndex], AL_SOURCE_STATE, &state);
+ if(state == AL_PLAYING || state == AL_PAUSED) {
+ /*it is being played, so we have to allocate a new source*/
+ findNewSource = 1;
+ } else {
+ /*it is not being played, so we can use it safely*/
+ findNewSource = 0;
+ }
+ }
+ if (findNewSource == 1) {
+#ifdef DEBUG
+ err_msg("(%s) DEBUG - Looking for a source for sound %d", prog, iIndex);
+#endif
+ for (i = 0; i < MAX_SOURCES; i++) {
+ alGetSourcei(Sources[i], AL_SOURCE_STATE, &state);
+ if(state != AL_PLAYING && state != AL_PAUSED) {
+ // alSourceStop(Sources[i]);
+ // alGetError();
+ for(j = 0; j < iNumSounds; j++)
+ if(theSounds[j].isLoaded && theSounds[j].sourceIndex == i)
+ theSounds[j].sourceIndex = -1;
+ break;
+ } else {
+ //TODO: what happens when all 16 sources are busy?
+ }
+ }
+ theSounds[iIndex].sourceIndex = i;
+ }
+ alSourcei (Sources[theSounds[iIndex].sourceIndex], AL_BUFFER, theSounds[iIndex].Buffer);
+ alSourcef (Sources[theSounds[iIndex].sourceIndex], AL_PITCH, 1.0f );
+ alSourcef (Sources[theSounds[iIndex].sourceIndex], AL_GAIN, 1.0f );
+ alSourcefv(Sources[theSounds[iIndex].sourceIndex], AL_POSITION, SourcePos );
+ alSourcefv(Sources[theSounds[iIndex].sourceIndex], AL_VELOCITY, SourceVel );
+ alSourcei (Sources[theSounds[iIndex].sourceIndex], AL_LOOPING, bLoop );
+ if (AlGetError("(%s) ERROR - Failed to set Source properties") != AL_TRUE)
+ return;
+
+ alSourcePlay(Sources[theSounds[iIndex].sourceIndex]);
+ if (AlGetError2("(%s) ERROR - Failed to play sound %d)", iIndex) != AL_TRUE)
+ return;
alGetError(); /* clear any AL errors beforehand */
@@ -413,8 +551,7 @@
err_ret("(%s) ERROR - Index (%d) out of bounds", prog, iIndex);
return;
}
- SSound_pause(&aSounds[iIndex]);
-
+ alSourcePause(Sources[theSounds[iIndex].sourceIndex]);
if (AlGetError2("(%s) ERROR - Failed to pause sound %d)", iIndex) != AL_TRUE)
return;
@@ -435,7 +572,7 @@
err_ret("(%s) ERROR - Index (%d) out of bounds", prog, iIndex);
return;
}
- SSound_stop(&aSounds[iIndex]);
+ alSourceStop(Sources[theSounds[iIndex].sourceIndex]);
if (AlGetError2("(%s) ERROR - Failed to stop sound %d)", iIndex) != AL_TRUE)
return;
--- a/openalbridge/openalbridge.h Fri Oct 16 15:56:42 2009 +0000
+++ b/openalbridge/openalbridge.h Fri Oct 16 16:42:51 2009 +0000
@@ -22,7 +22,6 @@
#include "common.h"
#include "wrappers.h"
#include "loaders.h"
-#include "ssound.h"
#include "alc.h"
@@ -40,11 +39,12 @@
void oalb_setvolume (const uint32_t iIndex, const char cPercentage);
void oalb_setglobalvolume (const char cPercentage);
void oalb_togglemute (void);
+ void oalb_fade (uint32_t iIndex, uint16_t quantity, ALboolean direction);
+ void oalb_fadein (uint32_t iIndex, uint16_t quantity);
+ void oalb_fadeout (uint32_t iIndex, uint16_t quantity);
+
/*
ALboolean openal_setposition (unsigned int index, float x, float y, float z);
- ALboolean openal_fadeout (unsigned int index, unsigned short int quantity);
- ALboolean openal_fadein (unsigned int index, unsigned short int quantity);
- ALboolean openal_fade (unsigned int index, unsigned short int quantity, ALboolean direction);
*/
#ifdef __cplusplus
--- a/openalbridge/ssound.c Fri Oct 16 15:56:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
- * OpenAL Bridge - a simple portable library for OpenAL interface
- * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>,
- * Mario Liebisch <mario.liebisch+hw@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "ssound.h"
-#include "loaders.h"
-
-extern SSound_t aSounds[MAX_SOUNDS];
-extern ALuint sources[MAX_SOURCES];
-extern const ALfloat NV[3];
-extern const ALfloat LO[6];
-extern int iNumSounds;
-extern char *prog;
-
-char SSound_load (SSound_t* pSound, const char* cFilename) {
- uint32_t magic;
- ALenum format;
- ALsizei bitsize, freq;
- char *data;
- FILE* fp;
-
- snprintf(pSound->Filename, 256, "%s", cFilename);
- pSound->source = -1;
- alGenBuffers(1, &pSound->Buffer);
-
- if(alGetError() != AL_NO_ERROR) {
- fprintf(stderr, "CSound: Couldn't create buffer.\n");
- return 0;
- }
-
- fp = fopen(pSound->Filename, "rb");
-
- if(!fp) {
- fprintf(stderr, "CSound: Couldn't open file for reading.\n");
- return 0;
- }
-
- if(fread(&magic, sizeof(uint32_t), 1, fp) < 1)
- {
- fclose(fp);
- fprintf(stderr, "CSound: Couldn't read file header.\n");
- return 0;
- }
- fclose(fp);
-
- switch (ENDIAN_BIG_32(magic)) {
- case OGG_FILE_FORMAT:
- load_oggvorbis (pSound->Filename, &format, &data, &bitsize, &freq);
- break;
- case WAV_FILE_FORMAT:
- load_wavpcm (pSound->Filename, &format, &data, &bitsize, &freq);
- break;
- default:
- errno = EINVAL;
- err_ret ("(%s) ERROR - File format (%08X) not supported", prog, ENDIAN_BIG_32(magic));
- return 0;
- break;
- }
-
- alBufferData(pSound->Buffer, format, data, bitsize, freq);
- if(alGetError() != AL_NO_ERROR)
- {
- fprintf(stderr, "CSound: Couldn't write buffer data.\n");
- return 0;
- }
- free(data);
-
- return 1;
-}
-
-void SSound_close(SSound_t* pSound)
-{
- SSound_stop(pSound);
- alDeleteBuffers(1, &pSound->Buffer);
- return;
-}
-
-void SSound_play(SSound_t* pSound, const char bLoop) {
- int i, j;
-
- if(pSound->source == -1) // need a new source
- {
- for(i = 0; i < MAX_SOURCES; i++)
- {
- ALint state;
- alGetSourcei(sources[i], AL_SOURCE_STATE, &state);
- if(state != AL_PLAYING && state != AL_PAUSED)
- {
-#ifdef DEBUG
- printf("using source %d (state 0x%x) for buffer.\n", i, state);
-#endif
- alSourceStop(sources[pSound->source]);
- alGetError();
-
- // lookup buffers associated with this source and reset them
- for(j = 0; j < iNumSounds; j++)
- if(aSounds[j].source == i)
- aSounds[j].source = -1;
- break;
- }
- }
- if(i == MAX_SOURCES) // no available source found; skip
- {
-#ifdef DEBUG
- printf("no source to play buffer %d!\n", i);
-#endif
- return;
- }
- pSound->source = i;
- }
- else // reuse already playing source
- {
- alSourceStop(sources[pSound->source]);
- }
- alSourcei (sources[pSound->source], AL_BUFFER, pSound->Buffer);
- alSourcef (sources[pSound->source], AL_PITCH, 1.0f);
- alSourcef (sources[pSound->source], AL_GAIN, 1.0f);
- alSourcefv(sources[pSound->source], AL_POSITION, NV );
- alSourcefv(sources[pSound->source], AL_VELOCITY, NV );
- alSourcei (sources[pSound->source], AL_LOOPING, bLoop );
- alSourcePlay(sources[pSound->source]);
-
- if((i = alGetError()) != AL_NO_ERROR)
- {
- fprintf(stderr, "CSound: SourcePlay error 0x%4x in source %d\n", i, pSound->source);
- }
-#ifdef DEBUG
- fprintf(stderr, "play %s%s [%d]\n", pSound->Filename, bLoop ? " forever" : " once", pSound->source);
-#endif
- usleep(0);
- return;
-}
-
-void SSound_pause(const SSound_t* pSound) {
- if(pSound->source == -1) // not playing
- return;
- alSourcePause(sources[pSound->source]);
-#ifdef DEBUG
- fprintf(stderr, "pause %s\n", pSound->Filename);
-#endif
- return;
-}
-
-void SSound_continue(const SSound_t* pSound) {
- if(pSound->source == -1) // not playing
- return;
- alSourcePlay(sources[pSound->source]);
-#ifdef DEBUG
- fprintf(stderr, "pause %s\n", pSound->Filename);
-#endif
- return;
-}
-
-void SSound_stop(SSound_t* pSound) {
- if(pSound->source == -1) // not playing
- return;
- alSourceStop(sources[pSound->source]);
- pSound->source = -1;
-#ifdef DEBUG
- fprintf(stderr, "stop %s\n", pSound->Filename);
-#endif
- return;
-}
-
-void SSound_volume(const SSound_t* pSound, const float fPercentage) {
- if(pSound->source == -1) // not playing
- return;
- alSourcef(sources[pSound->source], AL_GAIN, fPercentage);
- return;
-}
\ No newline at end of file
--- a/openalbridge/ssound.h Fri Oct 16 15:56:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * OpenAL Bridge - a simple portable library for OpenAL interface
- * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>,
- * Mario Liebisch <mario.liebisch+hw@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _SSOUND_H
-#define _SSOUND_H
-
-#include "common.h"
-
-char SSound_load (SSound_t* pSound, const char* cFilename);
-void SSound_close (SSound_t* pSound);
-void SSound_play (SSound_t* pSound, const char bLoop);
-void SSound_pause (const SSound_t* pSound);
-void SSound_continue (const SSound_t* pSound);
-void SSound_stop (SSound_t* pSound);
-void SSound_volume (const SSound_t* pSound, const float fPercentage);
-
-#endif /*_SSOUND_H*/
--- a/openalbridge/wrappers.c Fri Oct 16 15:56:42 2009 +0000
+++ b/openalbridge/wrappers.c Fri Oct 16 16:42:51 2009 +0000
@@ -20,7 +20,7 @@
extern char *prog;
-//extern ALint *Sources;
+extern ALint Sources[MAX_SOURCES];
void *Malloc (size_t nbytes) {
void *aptr;
@@ -75,7 +75,7 @@
return AL_TRUE;
}
-/* void *helper_fadein(void *tmp) {
+ void *helper_fadein(void *tmp) {
ALfloat gain;
ALfloat target_gain;
fade_t *fade;
@@ -91,7 +91,7 @@
err_msg("(%s) INFO - Fade-in in progress [index %d quantity %d]", prog, index, quantity);
#endif
- /*save the volume desired after the fade
+ /*save the volume desired after the fade*/
alGetSourcef(Sources[index], AL_GAIN, &target_gain);
if (target_gain > 1.0f || target_gain <= 0.0f)
target_gain = 1.0f;
@@ -144,7 +144,7 @@
AlGetError("(%s) WARN - Failed to set fade-out volume level");
- /*stop that sound and reset its volume
+ /*stop that sound and reset its volume*/
alSourceStop (Sources[index]);
alSourcef (Sources[index], AL_GAIN, old_gain);
@@ -156,4 +156,3 @@
return 0;
}
- */