X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.hpp;h=921b859efb09e074ddd838c7d451e826d43a6488;hb=4a8b226d0f28a842900d4851e7223e746435f9de;hp=88f2437f2cccf11642aa6fe8a9643921b58a5aec;hpb=8e724da15bbc4945cf02620b125e1b20622c5e09;p=supertux.git diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp index 88f2437f2..921b859ef 100644 --- a/src/audio/sound_manager.hpp +++ b/src/audio/sound_manager.hpp @@ -23,13 +23,14 @@ #include #include -#include -#include +#include +#include #include "math/vector.hpp" class SoundFile; class SoundSource; class StreamSoundSource; +class OpenALSoundSource; class SoundManager { @@ -42,15 +43,18 @@ public: * Creates a new sound source object which plays the specified soundfile. * You are responsible for deleting the sound source later (this will stop the * sound). - * This function might throw exceptions. It returns 0 if no audio device is - * available. + * This function never throws exceptions, but might return a DummySoundSource */ SoundSource* create_sound_source(const std::string& filename); /** * Convenience function to simply play a sound at a given position. */ void play(const std::string& name, const Vector& pos = Vector(-1, -1)); - void play_and_delete(SoundSource* source); + /** + * Adds the source to the list of managed sources (= the source gets deleted + * when it finished playing) + */ + void manage_source(SoundSource* source); /// preloads a sound, so that you don't get a lag later when playing it void preload(const std::string& name); @@ -61,19 +65,30 @@ public: void play_music(const std::string& filename, bool fade = false); void stop_music(float fadetime = 0); - bool is_music_enabled() { return music_enabled; } + bool is_music_enabled() { return music_enabled; } bool is_sound_enabled() { return sound_enabled; } bool is_audio_enabled() { - return (device == 0 || context == 0 ? false : true); + return device != 0 && context != 0; } void update(); + /* + * Tell soundmanager to call update() for stream_sound_source. + */ + void register_for_update( StreamSoundSource* sss ); + /* + * Unsubscribe from updates for stream_sound_source. + */ + void remove_from_update( StreamSoundSource* sss ); + private: - friend class SoundSource; + friend class OpenALSoundSource; friend class StreamSoundSource; + /** creates a new sound source, might throw exceptions, never returns NULL */ + OpenALSoundSource* intern_create_sound_source(const std::string& filename); static ALuint load_file_into_buffer(SoundFile* file); static ALenum get_sample_format(SoundFile* file); @@ -87,9 +102,12 @@ private: typedef std::map SoundBuffers; SoundBuffers buffers; - typedef std::vector SoundSources; + typedef std::vector SoundSources; SoundSources sources; + typedef std::vector StreamSoundSources; + StreamSoundSources update_list; + StreamSoundSource* music_source; bool music_enabled; @@ -99,4 +117,3 @@ private: extern SoundManager* sound_manager; #endif -