0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug #4559

Browse source
This commit is contained in:
Jon Daniel 2005-10-21 17:43:57 +00:00
parent 7c30164c39
commit 6546dabb93
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sound.cpp
View file

@ -61,7 +61,7 @@ bool init_sound() {
if(!mix_ok) {
if(Mix_OpenAudio(MIX_DEFAULT_FREQUENCY,MIX_DEFAULT_FORMAT,2,buf_size) == -1) {
mix_ok = false;
ERR_AUDIO << "Could not initialize audio: " << SDL_GetError() << "\n";
ERR_AUDIO << "Could not initialize audio: " << Mix_GetError() << "\n";
return false;
}
@ -73,7 +73,6 @@ bool init_sound() {
LOG_AUDIO << "Audio initialized.\n";
play_music(current_music);
return true;
}
return true;
}
@ -147,7 +146,7 @@ void play_music(std::string file)
Mix_Music* const music = Mix_LoadMUS(filename.c_str());
if(music == NULL) {
ERR_AUDIO << "Could not load music file '" << filename << "': "
<< SDL_GetError() << "\n";
<< Mix_GetError() << "\n";
return;
}
@ -160,7 +159,7 @@ void play_music(std::string file)
const int res = Mix_FadeInMusic(itor->second,-1,500);
if(res < 0) {
ERR_AUDIO << "Could not play music: " << SDL_GetError() << " " << file <<" \n";
ERR_AUDIO << "Could not play music: " << Mix_GetError() << " " << file <<" \n";
}
}
}
@ -188,7 +187,7 @@ void play_sound(const std::string& file)
if (cache == NULL) {
ERR_AUDIO << "Could not load sound file '" << filename << "': "
<< SDL_GetError() << "\n";
<< Mix_GetError() << "\n";
return;
}
}
@ -196,7 +195,7 @@ void play_sound(const std::string& file)
//play on the first available channel
const int res = Mix_PlayChannel(-1, cache, 0);
if(res < 0) {
ERR_AUDIO << "error playing sound effect: " << SDL_GetError() << "\n";
ERR_AUDIO << "error playing sound effect: " << Mix_GetError() << "\n";
}
}
}