Page MenuHomePhabricator (Chris)
Files F126534

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/sdl/sound.cpp b/util/sdl/sound.cpp
index 12ee792c..c1ce9c0d 100644
--- a/util/sdl/sound.cpp
+++ b/util/sdl/sound.cpp
@@ -1,88 +1,94 @@
#include "../sound.h"
#include <SDL.h>
#include "mixer/SDL_mixer.h"
+#include "configuration.h"
Sound::Sound():
own(NULL){
}
/* create from wav file (riff header + pcm) */
Sound::Sound(const char * data, int length):
own(NULL){
SDL_RWops * ops = SDL_RWFromConstMem(data, length);
this->data.chunk = Mix_LoadWAV_RW(ops, 1);
own = new int;
*own = 1;
}
/* load from path */
Sound::Sound(const std::string & path) throw (LoadException):
own(NULL){
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;
/* allegro uses 44100 by default with alsa9 */
int audio_rate = FREQUENCY;
// int audio_rate = 22050;
Uint16 audio_format = AUDIO_S16;
// Uint16 audio_format = MIX_DEFAULT_FORMAT;
int audio_channels = 2;
int audio_buffers = 4096;
// int audio_buffers = 44100;
if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)) {
printf("Unable to open audio: %s!\n", Mix_GetError());
// exit(1);
}
/* use the frequency enforced by the audio system */
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
FREQUENCY = audio_rate;
}
+static int scale(double in){
+ return (int)(in * Configuration::getSoundVolume() / 100.0);
+}
+
void Sound::play(){
if (data.chunk != NULL){
- /* FIXME: scale the volume based on the configuration sound setting */
- Mix_VolumeChunk(data.chunk, MIX_MAX_VOLUME);
+ Mix_VolumeChunk(data.chunk, scale(MIX_MAX_VOLUME));
Mix_PlayChannel(-1, data.chunk, 0);
}
}
void Sound::play(double volume, int pan){
if (data.chunk != NULL){
- /* FIXME: scale the volume based on the configuration sound setting */
- Mix_VolumeChunk(data.chunk, (int)(volume * MIX_MAX_VOLUME));
+ Mix_VolumeChunk(data.chunk, scale(volume * MIX_MAX_VOLUME));
Mix_PlayChannel(-1, data.chunk, 0);
}
}
void Sound::playLoop(){
- /* TODO */
+ if (data.chunk != NULL){
+ Mix_VolumeChunk(data.chunk, scale(MIX_MAX_VOLUME));
+ Mix_PlayChannel(-1, data.chunk, -1);
+ }
}
void Sound::destroy(){
- if ( own ){
+ if (own){
*own -= 1;
if ( *own == 0 ){
delete own;
if (data.chunk != NULL){
Mix_FreeChunk(data.chunk);
}
own = NULL;
}
}
}
void Sound::stop(){
if (data.channel != -1){
Mix_HaltChannel(data.channel);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 11:53 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
68902
Default Alt Text
(2 KB)

Event Timeline