Fix for correct music playing after dying in a different sector

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

diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index 7791df1..102b0a8 100644 (file)
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -18,6 +18,7 @@
 #define HEADER_SUPERTUX_AUDIO_SOUND_MANAGER_HPP
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -25,13 +26,14 @@
 #include <alc.h>
 
 #include "math/vector.hpp"
+#include "util/currenton.hpp"
 
 class SoundFile;
 class SoundSource;
 class StreamSoundSource;
 class OpenALSoundSource;
 
-class SoundManager
+class SoundManager : public Currenton<SoundManager>
 {
 public:
   SoundManager();
@@ -44,7 +46,7 @@ public:
    * sound).
    * This function never throws exceptions, but might return a DummySoundSource
    */
-  SoundSource* create_sound_source(const std::string& filename);
+  std::unique_ptr<SoundSource> create_sound_source(const std::string& filename);
   /**
    * Convenience function to simply play a sound at a given position.
    */
@@ -53,7 +55,7 @@ public:
    * Adds the source to the list of managed sources (= the source gets deleted
    * when it finished playing)
    */
-  void manage_source(SoundSource* source);
+  void manage_source(std::unique_ptr<SoundSource> source);
   /// preloads a sound, so that you don't get a lag later when playing it
   void preload(const std::string& name);
 
@@ -62,6 +64,8 @@ public:
 
   void enable_music(bool music_enabled);
   void play_music(const std::string& filename, bool fade = false);
+  void pause_music(float fadetime = 0);
+  void resume_music(float fadetime = 0);
   void stop_music(float fadetime = 0);
 
   bool is_music_enabled() { return music_enabled; }
@@ -70,7 +74,9 @@ public:
   bool is_audio_enabled() {
     return device != 0 && context != 0;
   }
-
+  std::string get_current_music() const {
+    return current_music;
+  }
   void update();
 
   /*
@@ -87,9 +93,9 @@ private:
   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);
+  std::unique_ptr<OpenALSoundSource> intern_create_sound_source(const std::string& filename);
+  static ALuint load_file_into_buffer(SoundFile& file);
+  static ALenum get_sample_format(const SoundFile& file);
 
   void print_openal_version();
   void check_alc_error(const char* message);
@@ -101,13 +107,13 @@ private:
 
   typedef std::map<std::string, ALuint> SoundBuffers;
   SoundBuffers buffers;
-  typedef std::vector<OpenALSoundSource*> SoundSources;
+  typedef std::vector<std::unique_ptr<OpenALSoundSource> > SoundSources;
   SoundSources sources;
 
   typedef std::vector<StreamSoundSource*> StreamSoundSources;
   StreamSoundSources update_list;
 
-  StreamSoundSource* music_source;
+  std::unique_ptr<StreamSoundSource> music_source;
 
   bool music_enabled;
   std::string current_music;
@@ -117,8 +123,6 @@ private:
   SoundManager& operator=(const SoundManager&);
 };
 
-extern SoundManager* sound_manager;
-
 #endif
 
 /* EOF */