No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/sdl/sound.cpp b/util/sdl/sound.cpp
	index a883fda2..04dee355 100644
	--- a/util/sdl/sound.cpp
	+++ b/util/sdl/sound.cpp
	@@ -1,65 +1,67 @@
	#include "../sound.h"
	#include <SDL.h>
	#include "mixer/SDL_mixer.h"

	Sound::Sound():
	own(NULL){
	}

	/* create from wav file (riff header + pcm) */
	Sound::Sound(const char * data, int length){
	/* TODO */
	}

	/* load from path */
	Sound::Sound(const std::string & path) throw (LoadException){
	data.chunk = Mix_LoadWAV(path.c_str());
	if (!data.chunk){
	printf("Can't load sound %s\n", path.c_str());
	// throw LoadException("Could not load sound " + path);
	} else {
	own = new int;
	*own = 1;
	}
	}

	void Sound::initialize(){
	- int audio_rate = 22050;
	+ // int audio_rate = 22050;
	+ /* allegro uses 44100 by default with alsa9 */
	+ int audio_rate = 44100;
	// Uint16 audio_format = AUDIO_S16;
	Uint16 audio_format = MIX_DEFAULT_FORMAT;
	int audio_channels = 2;
	int audio_buffers = 4096;
	if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)) {
	printf("Unable to open audio: %s!\n", Mix_GetError());
	// exit(1);
	}
	}

	void Sound::play(){
	Mix_VolumeChunk(data.chunk, MIX_MAX_VOLUME);
	Mix_PlayChannel(-1, data.chunk, 0);
	}

	void Sound::play(double volume, int pan){
	Mix_VolumeChunk(data.chunk, (int)(volume * MIX_MAX_VOLUME));
	Mix_PlayChannel(-1, data.chunk, 0);
	}

	void Sound::playLoop(){
	/* TODO */
	}

	void Sound::destroy(){
	if ( own ){
	*own -= 1;
	if ( *own == 0 ){
	delete own;
	Mix_FreeChunk(data.chunk);
	own = NULL;
	}
	}
	}

	void Sound::stop(){
	/* TODO */
	}