X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fstream_sound_source.cpp;h=bb178725d4cee6dc9538b19f51cc2b516d08f99a;hb=25da12d34b356745dcf3669f234e17ee5bfa6b80;hp=d27856342649ce4023c659639e79adf256973f15;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/audio/stream_sound_source.cpp b/src/audio/stream_sound_source.cpp
index d27856342..bb178725d 100644
--- a/src/audio/stream_sound_source.cpp
+++ b/src/audio/stream_sound_source.cpp
@@ -1,12 +1,10 @@
-//  $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 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 3 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
@@ -14,28 +12,31 @@
 //  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 <config.h>
-#include <assert.h>
-
-#include <SDL.h>
-
-#include "stream_sound_source.hpp"
-#include "sound_manager.hpp"
-#include "sound_file.hpp"
-#include "log.hpp"
-
-StreamSoundSource::StreamSoundSource()
-  : file(0), fade_state(NoFading), looping(false)
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "audio/sound_file.hpp"
+#include "audio/sound_manager.hpp"
+#include "audio/stream_sound_source.hpp"
+#include "supertux/timer.hpp"
+#include "util/log.hpp"
+
+StreamSoundSource::StreamSoundSource() :
+  file(0), 
+  fade_state(NoFading), 
+  fade_start_time(),
+  fade_time(),
+  looping(false)
 {
   alGenBuffers(STREAMFRAGMENTS, buffers);
   SoundManager::check_al_error("Couldn't allocate audio buffers: ");
+  //add me to update list
+  sound_manager->register_for_update( this );
 }
 
 StreamSoundSource::~StreamSoundSource()
 {
+  //don't update me any longer
+  sound_manager->remove_from_update( this );
   delete file;
   stop();
   alDeleteBuffers(STREAMFRAGMENTS, buffers);
@@ -64,7 +65,7 @@ StreamSoundSource::update()
   for(ALint i = 0; i < processed; ++i) {
     ALuint buffer;
     alSourceUnqueueBuffers(source, 1, &buffer);
-    SoundManager::check_al_error("Couldn't unqueu audio buffer: ");
+    SoundManager::check_al_error("Couldn't unqueue audio buffer: ");
 
     if(fillBufferAndQueue(buffer) == false)
       break;
@@ -73,15 +74,14 @@ StreamSoundSource::update()
   if(!playing()) {
     if(processed == 0 || !looping)
       return;
-    
-    // we might have to restart the source if we had a buffer underrun  
+
+    // we might have to restart the source if we had a buffer underrun
     log_info << "Restarting audio source because of buffer underrun" << std::endl;
     play();
   }
 
   if(fade_state == FadingOn) {
-    Uint32 ticks = SDL_GetTicks();
-    float time = (ticks - fade_start_ticks) / 1000.0;
+    float time = real_time - fade_start_time;
     if(time >= fade_time) {
       set_gain(1.0);
       fade_state = NoFading;
@@ -89,8 +89,7 @@ StreamSoundSource::update()
       set_gain(time / fade_time);
     }
   } else if(fade_state == FadingOff) {
-    Uint32 ticks = SDL_GetTicks();
-    float time = (ticks - fade_start_ticks) / 1000.0;
+    float time = real_time - fade_start_time;
     if(time >= fade_time) {
       stop();
       fade_state = NoFading;
@@ -105,7 +104,7 @@ StreamSoundSource::set_fading(FadeState state, float fade_time)
 {
   this->fade_state = state;
   this->fade_time = fade_time;
-  this->fade_start_ticks = SDL_GetTicks();
+  this->fade_start_time = real_time;
 }
 
 bool
@@ -116,7 +115,7 @@ StreamSoundSource::fillBufferAndQueue(ALuint buffer)
   size_t bytesread = 0;
   do {
     bytesread += file->read(bufferdata + bytesread,
-        STREAMFRAGMENTSIZE - bytesread);
+                            STREAMFRAGMENTSIZE - bytesread);
     // end of sound file
     if(bytesread < STREAMFRAGMENTSIZE) {
       if(looping)
@@ -129,14 +128,15 @@ StreamSoundSource::fillBufferAndQueue(ALuint buffer)
   if(bytesread > 0) {
     ALenum format = SoundManager::get_sample_format(file);
     alBufferData(buffer, format, bufferdata, bytesread, file->rate);
-    delete[] bufferdata;
     SoundManager::check_al_error("Couldn't refill audio buffer: ");
 
     alSourceQueueBuffers(source, 1, &buffer);
     SoundManager::check_al_error("Couldn't queue audio buffer: ");
   }
+  delete[] bufferdata;
 
   // return false if there aren't more buffers to fill
   return bytesread >= STREAMFRAGMENTSIZE;
 }
 
+/* EOF */