-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// GNU General Public License for more details.
//
// You should have received a copy of the GNU 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 <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "sound_manager.hpp"
+#include "audio/sound_manager.hpp"
+#include <SDL.h>
+#include <assert.h>
#include <stdexcept>
-#include <iostream>
#include <sstream>
#include <memory>
-#include <assert.h>
-#include <SDL.h>
-#include "sound_file.hpp"
-#include "sound_source.hpp"
-#include "openal_sound_source.hpp"
-#include "stream_sound_source.hpp"
-#include "dummy_sound_source.hpp"
-#include "log.hpp"
-#include "timer.hpp"
-
-#ifndef DEBUG
- /** Older openal versions often miss this function and it isn't that vital for
- * supertux...
- */
-#ifdef alcGetString
-#undef alcGetString
-#endif
-#define alcGetString(x,y) ""
-#endif
-
-SoundManager* sound_manager = 0;
-
-SoundManager::SoundManager()
- : device(0), context(0), sound_enabled(false), music_source(0),
- music_enabled(false)
+#include "audio/dummy_sound_source.hpp"
+#include "audio/sound_file.hpp"
+#include "audio/stream_sound_source.hpp"
+#include "util/log.hpp"
+
+SoundManager::SoundManager() :
+ device(0),
+ context(0),
+ sound_enabled(false),
+ buffers(),
+ sources(),
+ update_list(),
+ music_source(0),
+ music_enabled(false),
+ current_music()
{
try {
device = alcOpenDevice(0);
sound_enabled = true;
music_enabled = true;
} catch(std::exception& e) {
- if(context != NULL)
+ if(context != NULL) {
alcDestroyContext(context);
- context = NULL;
- if(device != NULL)
+ context = NULL;
+ }
+ if(device != NULL) {
alcCloseDevice(device);
- device = NULL;
+ device = NULL;
+ }
log_warning << "Couldn't initialize audio device: " << e.what() << std::endl;
print_openal_version();
}
if(context != NULL) {
alcDestroyContext(context);
+ context = NULL;
}
if(device != NULL) {
alcCloseDevice(device);
+ device = NULL;
}
}
try {
file->read(samples, file->size);
alBufferData(buffer, format, samples,
- static_cast<ALsizei> (file->size),
- static_cast<ALsizei> (file->rate));
+ static_cast<ALsizei> (file->size),
+ static_cast<ALsizei> (file->rate));
check_al_error("Couldn't fill audio buffer: ");
} catch(...) {
delete[] samples;
OpenALSoundSource*
SoundManager::intern_create_sound_source(const std::string& filename)
{
- if(!sound_enabled)
- throw std::runtime_error("sound disabled");
+ assert(sound_enabled);
- std::auto_ptr<OpenALSoundSource> source (new OpenALSoundSource());
+ std::unique_ptr<OpenALSoundSource> source (new OpenALSoundSource());
ALuint buffer;
buffer = i->second;
} else {
// Load sound file
- std::auto_ptr<SoundFile> file (load_sound_file(filename));
+ std::unique_ptr<SoundFile> file (load_sound_file(filename));
if(file->size < 100000) {
buffer = load_file_into_buffer(file.get());
source->set_sound_file(file.release());
return source;
}
+
+ log_debug << "Uncached sound \"" << filename << "\" requested to be played" << std::endl;
}
alSourcei(source->source, AL_BUFFER, buffer);
// already loaded?
if(i != buffers.end())
return;
+ try {
+ std::unique_ptr<SoundFile> file (load_sound_file(filename));
+ // only keep small files
+ if(file->size >= 100000)
+ return;
- std::auto_ptr<SoundFile> file (load_sound_file(filename));
- // only keep small files
- if(file->size >= 100000)
- return;
-
- ALuint buffer = load_file_into_buffer(file.get());
- buffers.insert(std::make_pair(filename, buffer));
+ ALuint buffer = load_file_into_buffer(file.get());
+ buffers.insert(std::make_pair(filename, buffer));
+ } catch(std::exception& e) {
+ log_warning << "Error while preloading sound file: " << e.what() << std::endl;
+ }
}
void
return;
try {
- std::auto_ptr<OpenALSoundSource> source
- (intern_create_sound_source(filename));
+ std::unique_ptr<OpenALSoundSource> source
+ (intern_create_sound_source(filename));
- if(pos == Vector(-1, -1)) {
- source->set_rollof_factor(0);
+ if(pos.x < 0 || pos.y < 0) {
+ source->set_relative(true);
} else {
source->set_position(pos);
}
SoundManager::remove_from_update( StreamSoundSource* sss ){
if( sss != NULL ){
StreamSoundSources::iterator i = update_list.begin();
- while( i != update_list.end() ){
+ while( i != update_list.end() ){
if( *i == sss ){
i = update_list.erase(i);
} else {
} else {
if(music_source) {
delete music_source;
- music_source = 0;
+ music_source = NULL;
}
}
}
{
if(fadetime > 0) {
if(music_source
- && music_source->get_fade_state() != StreamSoundSource::FadingOff)
+ && music_source->get_fade_state() != StreamSoundSource::FadingOff)
music_source->set_fading(StreamSoundSource::FadingOff, fadetime);
} else {
delete music_source;
}
try {
- std::auto_ptr<StreamSoundSource> newmusic (new StreamSoundSource());
- alSourcef(newmusic->source, AL_ROLLOFF_FACTOR, 0);
+ std::unique_ptr<StreamSoundSource> newmusic (new StreamSoundSource());
newmusic->set_sound_file(load_sound_file(filename));
newmusic->set_looping(true);
+ newmusic->set_relative(true);
if(fade)
newmusic->set_fading(StreamSoundSource::FadingOn, .5f);
newmusic->play();
music_source = newmusic.release();
} catch(std::exception& e) {
log_warning << "Couldn't play music file '" << filename << "': " << e.what() << std::endl;
+ // When this happens, previous music continued playing, stop it, just in case.
+ stop_music(0);
}
}
throw std::runtime_error(msg.str());
}
}
+
+/* EOF */