fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / audio / sound_manager.hpp

diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index e93113b..657ca06 100644 (file)
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -30,6 +30,7 @@
 class SoundFile;
 class SoundSource;
 class StreamSoundSource;
+class OpenALSoundSource;
 
 class SoundManager
 {
@@ -50,6 +51,13 @@ public:
    * Convenience function to simply play a sound at a given position.
    */
   void play(const std::string& name, const Vector& pos = Vector(-1, -1));
+  /**
+   * 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);
 
   void set_listener_position(const Vector& position);
   void set_listener_velocity(const Vector& velocity);
@@ -57,13 +65,27 @@ public:
   void enable_music(bool music_enabled);
   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_sound_enabled() { return sound_enabled; }
 
+  bool is_audio_enabled() {
+      return (device == 0 || context == 0 ? false : true);
+  }
+
   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;
 
   static ALuint load_file_into_buffer(SoundFile* file);
@@ -79,9 +101,12 @@ private:
 
   typedef std::map<std::string, ALuint> SoundBuffers;
   SoundBuffers buffers;
-  typedef std::vector<SoundSource*> SoundSources;
+  typedef std::vector<OpenALSoundSource*> SoundSources;
   SoundSources sources;
 
+  typedef std::vector<StreamSoundSource*> StreamSoundSources;
+  StreamSoundSources update_list;
+
   StreamSoundSource* music_source;
 
   bool music_enabled;
@@ -91,4 +116,3 @@ private:
 extern SoundManager* sound_manager;
 
 #endif
-