X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.cpp;h=b2697c1abd32cfc22b3dbc5fa7e60584c6776ce7;hb=6b0c80bde84af0bf9323320d99f2fccd7c9eeedd;hp=2e83630e6328503e23a8f1bf05a58aaf4d7d1a15;hpb=666b1ac7e7f7825ef77930a4a9f87e1bbc4a10ce;p=supertux.git diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp index 2e83630e6..b2697c1ab 100644 --- a/src/audio/sound_manager.cpp +++ b/src/audio/sound_manager.cpp @@ -126,7 +126,7 @@ OpenALSoundSource* SoundManager::intern_create_sound_source(const std::string& filename) { if(!sound_enabled) - throw new std::exception("sound disabled"); + throw std::runtime_error("sound disabled"); std::auto_ptr source (new OpenALSoundSource()); @@ -139,7 +139,7 @@ SoundManager::intern_create_sound_source(const std::string& filename) } else { // Load sound file std::auto_ptr file (load_sound_file(filename)); - + if(file->size < 100000) { buffer = load_file_into_buffer(file.get()); buffers.insert(std::make_pair(filename, buffer)); @@ -148,6 +148,8 @@ SoundManager::intern_create_sound_source(const std::string& filename) 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); @@ -159,7 +161,7 @@ SoundManager::create_sound_source(const std::string& filename) { if(!sound_enabled) return create_dummy_sound_source(); - + try { return intern_create_sound_source(filename); } catch(std::exception &e) {