Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Shoot me. But I have added alut as a dep. It loads sounds well. Engine sounds are now playing too.

Browse Source
This commit is contained in:
Allanis 2013-06-09 16:19:54 +01:00
parent 0b402d6c15
commit 12eae87db9
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -41,6 +41,7 @@ Dependencied:
-- libsdl-image1.2 -- libsdl-image1.2
-- libgl1-mesa-dri -- libgl1-mesa-dri
-- libopenal0a -- libopenal0a
-- libalut0
-- libvorbis0a -- libvorbis0a
-- libvorbisfile3 -- libvorbisfile3
-- libxml2 -- libxml2
@ -51,6 +52,7 @@ Dependencied:
-- libsdl-image1.2-dev -- libsdl-image1.2-dev
-- libgl1-mesa-dev -- libgl1-mesa-dev
-- libopenal-dev -- libopenal-dev
-- libalut-dev
-- libvorbis-dev -- libvorbis-dev
-- libxml2-dev -- libxml2-dev
-- libfreetype6-dev -- libfreetype6-dev

4
bin/Makefile
View File

@ -21,7 +21,7 @@ CLUA = -I../lib/lua
CSDL = $(shell sdl-config --cflags) CSDL = $(shell sdl-config --cflags)
CXML = $(shell xml2-config --cflags) CXML = $(shell xml2-config --cflags)
CTTF = $(shell freetype-config --cflags) CTTF = $(shell freetype-config --cflags)
CAL = -lopenal CAL = -lopenal $(shell freealut-config --cflags)
CVORBIS = CVORBIS =
CGL = CGL =
CFLAGS = $(CLUA) $(CPLUTO) $(CSDL) $(CXML) $(CTTF) $(CGL) $(CAL) $(CVORBIS) $(VERSION) -D$(OS) -fgnu89-inline CFLAGS = $(CLUA) $(CPLUTO) $(CSDL) $(CXML) $(CTTF) $(CGL) $(CAL) $(CVORBIS) $(VERSION) -D$(OS) -fgnu89-inline
@ -37,7 +37,7 @@ LDSDL = $(shell sdl-config --libs) -lSDL_image
LDXML = $(shell xml2-config --libs) LDXML = $(shell xml2-config --libs)
LDTTF = $(shell freetype-config --libs) LDTTF = $(shell freetype-config --libs)
LDGL = -lGL LDGL = -lGL
LDAL = -lopenal LDAL = -lopenal $(shell freealut-config --libs)
LDVORBIS = -lvorbisfile LDVORBIS = -lvorbisfile
LDPNG = -lpng LDPNG = -lpng
LDFLAGS = -lm $(LDLUA) $(LDPLUTO) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG) $(LDAL) $(LDVORBIS) LDFLAGS = -lm $(LDLUA) $(LDPLUTO) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG) $(LDAL) $(LDVORBIS)

4
src/player.c
View File

@ -1391,12 +1391,12 @@ void player_afterburnOver(void) {
// Start accelerating. // Start accelerating.
void player_accel(double acc) { void player_accel(double acc) {
player_acc = acc; player_acc = acc;
//player_playSound(player->ship->sound, 0); player_playSound(player->ship->sound, 0);
} }
void player_accelOver(void) { void player_accelOver(void) {
player_acc = 0; player_acc = 0;
//player_stopSound(); player_stopSound();
} }
// Take a screenshot. // Take a screenshot.

10
src/sound.c
View File

@ -1,5 +1,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <AL/alc.h> #include <AL/alc.h>
#include <AL/alut.h>
#include <SDL.h> #include <SDL.h>
#include <SDL_thread.h> #include <SDL_thread.h>
@ -127,6 +128,9 @@ int sound_init(void) {
sound_lock = SDL_CreateMutex(); sound_lock = SDL_CreateMutex();
soundLock(); soundLock();
// Initialize alut - I think it's worth it.
alutInitWithoutContext(NULL, NULL);
const ALchar* device = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); const ALchar* device = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
// Open the default device. // Open the default device.
al_device = alcOpenDevice(NULL); al_device = alcOpenDevice(NULL);
@ -330,8 +334,10 @@ static int sound_load(ALuint* buffer, char* filename) {
soundLock(); soundLock();
// Bind to OpenAL buffer. // Bind to OpenAL buffer.
alGenBuffers(1, buffer); (*buffer) = alutCreateBufferFromFileImage(wavdata, size);
alBufferData(*buffer, AL_FORMAT_MONO16, wavdata, size, 22050); if((*buffer) == AL_NONE) WARN("FAILURE: %s", alutGetErrorString(alutGetError()));
//alGenBuffers(1, buffer);
//alBufferData(*buffer, AL_FORMAT_MONO16, wavdata, size, 22050);
// Errors? // Errors?
if((err = alGetError()) != AL_NO_ERROR) { if((err = alGetError()) != AL_NO_ERROR) {