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

diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp
index 1078ff760..0576fe6ba 100644
--- a/src/audio/sound_manager.cpp
+++ b/src/audio/sound_manager.cpp
@@ -1,3 +1,22 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "sound_manager.hpp"
 
 #include <stdexcept>
@@ -8,7 +27,8 @@
 #include "sound_file.hpp"
 #include "sound_source.hpp"
 #include "stream_sound_source.hpp"
-#include "msg.hpp"
+#include "log.hpp"
+#include "timer.hpp"
 
 SoundManager* sound_manager = 0;
 
@@ -18,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.");
     }
 
@@ -32,9 +51,13 @@ SoundManager::SoundManager()
     check_al_error("Audio error after init: ");
     sound_enabled = true;
   } catch(std::exception& e) {
-    device = 0;
-    context = 0;
-    msg_warning("Couldn't initialize audio device:" << e.what());
+    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();
   }
 }
@@ -52,10 +75,10 @@ SoundManager::~SoundManager()
     alDeleteBuffers(1, &buffer);
   }
 
-  if(context != 0) {
+  if(context != NULL) {
     alcDestroyContext(context);
   }
-  if(device != 0) {
+  if(device != NULL) {
     alcCloseDevice(device);
   }
 }
@@ -119,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);
@@ -129,23 +152,40 @@ SoundManager::play(const std::string& filename, const Vector& pos)
     source->play();
     sources.push_back(source);
   } catch(std::exception& e) {
-    msg_warning("Couldn't play sound " << filename << ": " << e.what());
+    log_warning << "Couldn't play sound " << filename << ": " << e.what() << std::endl;
+  }
+}
+
+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);
@@ -166,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 = "";
 }
@@ -182,7 +222,7 @@ SoundManager::play_music(const std::string& filename, bool fade)
 
   if(filename == "") {
     delete music_source;
-    music_source = 0;
+    music_source = NULL;
     return;
   }
 
@@ -198,8 +238,7 @@ SoundManager::play_music(const std::string& filename, bool fade)
     delete music_source;
     music_source = newmusic.release();
   } catch(std::exception& e) {
-    msg_warning("Couldn't play music file '" << filename << "': "
-      << e.what());
+    log_warning << "Couldn't play music file '" << filename << "': " << e.what() << std::endl;
   }
 }
 
@@ -225,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(); ) {
@@ -249,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
@@ -281,10 +322,10 @@ SoundManager::get_sample_format(SoundFile* file)
 void
 SoundManager::print_openal_version()
 {
-  msg_info("OpenAL Vendor: " << alGetString(AL_VENDOR));
-  msg_info("OpenAL Version: " << alGetString(AL_VERSION));
-  msg_info("OpenAL Renderer: " << alGetString(AL_RENDERER));
-  msg_info("OpenAl Extensions: " << alGetString(AL_EXTENSIONS));
+  log_info << "OpenAL Vendor: " << alGetString(AL_VENDOR) << std::endl;
+  log_info << "OpenAL Version: " << alGetString(AL_VERSION) << std::endl;
+  log_info << "OpenAL Renderer: " << alGetString(AL_RENDERER) << std::endl;
+  log_info << "OpenAl Extensions: " << alGetString(AL_EXTENSIONS) << std::endl;
 }
 
 void