separate nolok sprite

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

diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp
index cd9d9cd..656caac 100644 (file)
--- a/src/audio/sound_manager.cpp
+++ b/src/audio/sound_manager.cpp
@@ -151,12 +151,12 @@ SoundManager::enable_music(bool enable)
 }
 
 void
-SoundManager::stop_music(bool fade)
+SoundManager::stop_music(float fadetime)
 {
-  if(fade) {
+  if(fadetime > 0) {
     if(music_source
         && music_source->get_fade_state() != StreamSoundSource::FadingOff)
-      music_source->set_fading(StreamSoundSource::FadingOff, .5f);
+      music_source->set_fading(StreamSoundSource::FadingOff, fadetime);
   } else {
     delete music_source;
     music_source = 0;
@@ -167,12 +167,18 @@ SoundManager::stop_music(bool fade)
 void
 SoundManager::play_music(const std::string& filename, bool fade)
 {
-  if(filename == current_music)
+  if(filename == current_music && music_source != NULL)
     return;
   current_music = filename;
   if(!music_enabled)
     return;
 
+  if(filename == "") {
+    delete music_source;
+    music_source = 0;
+    return;
+  }
+
   try {
     std::auto_ptr<StreamSoundSource> newmusic (new StreamSoundSource());
     alSourcef(newmusic->source, AL_ROLLOFF_FACTOR, 0);
@@ -192,7 +198,7 @@ SoundManager::play_music(const std::string& filename, bool fade)
 void
 SoundManager::set_listener_position(const Vector& pos)
 {
-  static Uint32 lastticks = SDL_GetTicks();
+  static Uint32 lastticks = 0;
 
   Uint32 current_ticks = SDL_GetTicks();
   if(current_ticks - lastticks < 300)
@@ -211,7 +217,7 @@ SoundManager::set_listener_velocity(const Vector& vel)
 void
 SoundManager::update()
 {
-  static Uint32 lastticks = SDL_GetTicks();
+  static Uint32 lastticks = 0;
 
   Uint32 current_ticks = SDL_GetTicks();
   if(current_ticks - lastticks < 300)
@@ -267,7 +273,7 @@ SoundManager::print_openal_version()
   std::cout << "OpenAL Vendor: " << alGetString(AL_VENDOR) << "\n"
             << "OpenAL Version: " << alGetString(AL_VERSION) << "\n" 
             << "OpenAL Renderer: " << alGetString(AL_RENDERER) << "\n"
-            << "OpenAl Extensions: " << alGetString(AL_RENDERER) << "\n";
+            << "OpenAl Extensions: " << alGetString(AL_EXTENSIONS) << "\n";
 }
 
 void