X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.cpp;h=0576fe6ba9cd6d1fbcd9a6cba820250512317fa0;hb=d99e2443318865c0f379170b4ef2aa30f515b235;hp=a05ca019cccc506dc0836c59e8eb2d05e0acb877;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp
index a05ca019c..0576fe6ba 100644
--- a/src/audio/sound_manager.cpp
+++ b/src/audio/sound_manager.cpp
@@ -28,6 +28,7 @@
 #include "sound_source.hpp"
 #include "stream_sound_source.hpp"
 #include "log.hpp"
+#include "timer.hpp"
 
 SoundManager* sound_manager = 0;
 
@@ -37,8 +38,7 @@ SoundManager::SoundManager()
 {
   try {
     device = alcOpenDevice(0);
-    if(device == 0) {
-      print_openal_version();
+    if (device == NULL) {
       throw std::runtime_error("Couldn't open audio device.");
     }
 
@@ -51,11 +51,14 @@ SoundManager::SoundManager()
     check_al_error("Audio error after init: ");
     sound_enabled = true;
   } catch(std::exception& e) {
-    device = 0;
-    context = 0;
-    log_warning << "Couldn't initialize audio device:" << e.what() << std::endl;
+    if(context != NULL)
+      alcDestroyContext(context);
+    context = NULL;
+    if(device != NULL)
+      alcCloseDevice(device);
+    device = NULL;
+    log_warning << "Couldn't initialize audio device: " << e.what() << std::endl;
     print_openal_version();
-    throw e;
   }
 }
 
@@ -72,10 +75,10 @@ SoundManager::~SoundManager()
     alDeleteBuffers(1, &buffer);
   }
 
-  if(context != 0) {
+  if(context != NULL) {
     alcDestroyContext(context);
   }
-  if(device != 0) {
+  if(device != NULL) {
     alcCloseDevice(device);
   }
 }
@@ -139,7 +142,7 @@ SoundManager::play(const std::string& filename, const Vector& pos)
 {
   try {
     SoundSource* source = create_sound_source(filename);
-    if(source == 0)
+    if(source == NULL)
       return;
     if(pos == Vector(-1, -1)) {
       alSourcef(source->source, AL_ROLLOFF_FACTOR, 0);
@@ -154,18 +157,35 @@ SoundManager::play(const std::string& filename, const Vector& pos)
 }
 
 void
+SoundManager::play_and_delete(SoundSource* source)
+{
+  if (!source) {
+    log_debug << "ignoring NULL SoundSource" << std::endl;
+    return;
+  }
+  try {
+    source->play();
+    sources.push_back(source);
+  } catch(std::exception& e) {
+    log_warning << "Couldn't play SoundSource: " << e.what() << std::endl;
+  }
+}
+
+void
 SoundManager::enable_sound(bool enable)
 {
-  if(device == 0)
+  if(device == NULL)
     return;
+
   sound_enabled = enable;
 }
 
 void
 SoundManager::enable_music(bool enable)
 {
-  if(device == 0)
+  if(device == NULL)
     return;
+
   music_enabled = enable;
   if(music_enabled) {
     play_music(current_music);
@@ -186,7 +206,7 @@ SoundManager::stop_music(float fadetime)
       music_source->set_fading(StreamSoundSource::FadingOff, fadetime);
   } else {
     delete music_source;
-    music_source = 0;
+    music_source = NULL;
   }
   current_music = "";
 }
@@ -202,7 +222,7 @@ SoundManager::play_music(const std::string& filename, bool fade)
 
   if(filename == "") {
     delete music_source;
-    music_source = 0;
+    music_source = NULL;
     return;
   }
 
@@ -244,12 +264,11 @@ SoundManager::set_listener_velocity(const Vector& vel)
 void
 SoundManager::update()
 {
-  static Uint32 lastticks = 0;
+  static float lasttime = real_time;
 
-  Uint32 current_ticks = SDL_GetTicks();
-  if(current_ticks - lastticks < 300)
+  if(real_time - lasttime < 0.3)
     return;
-  lastticks = current_ticks;
+  lasttime = real_time;
 
   // update and check for finished sound sources
   for(SoundSources::iterator i = sources.begin(); i != sources.end(); ) {
@@ -268,9 +287,12 @@ SoundManager::update()
   if(music_source) {
     music_source->update();
   }
-  
-  alcProcessContext(context);
-  check_alc_error("Error while processing audio context: ");
+
+  if (context)
+  {
+    alcProcessContext(context);
+    check_alc_error("Error while processing audio context: ");
+  }
 }
 
 ALenum