*include stdio.h in a couple files for MinGW GCC 4.4.0

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

diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index e93113b..9794e6d 100644 (file)
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -23,13 +23,15 @@
 #include <vector>
 #include <map>
 
-#include <AL/alc.h>
-#include <AL/al.h>
+#include <alc.h>
+#include <al.h>
+
 #include "math/vector.hpp"
 
 class SoundFile;
 class SoundSource;
 class StreamSoundSource;
+class OpenALSoundSource;
 
 class SoundManager
 {
@@ -42,14 +44,20 @@ 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));
+  /**
+   * 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,15 +65,31 @@ 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;
+  }
+
   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);
 
@@ -79,9 +103,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 +118,3 @@ private:
 extern SoundManager* sound_manager;
 
 #endif
-