X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faudio%2Fstream_sound_source.cpp;h=e51a2e5fd5d9f8b47ef7f9da7e96811afbe4327f;hb=8e52a5b000d732e96b1cc461163c4778b434dc27;hp=5a0172362c4669fbc300482e55c5dd9796ed0b4c;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git

diff --git a/src/audio/stream_sound_source.cpp b/src/audio/stream_sound_source.cpp
index 5a0172362..e51a2e5fd 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,44 +12,41 @@
 //  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 "timer.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(),
+  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 );
+  SoundManager::current()->register_for_update( this );
 }
 
 StreamSoundSource::~StreamSoundSource()
 {
   //don't update me any longer
-  sound_manager->remove_from_update( this );
-  delete file;
+  SoundManager::current()->remove_from_update( this );
+  file.reset();
   stop();
   alDeleteBuffers(STREAMFRAGMENTS, buffers);
   SoundManager::check_al_error("Couldn't delete audio buffers: ");
 }
 
 void
-StreamSoundSource::set_sound_file(SoundFile* newfile)
+StreamSoundSource::set_sound_file(std::unique_ptr<SoundFile> newfile)
 {
-  delete file;
-  file = newfile;
+  file = std::move(newfile);
 
   ALint queued;
   alGetSourcei(source, AL_BUFFERS_QUEUED, &queued);
@@ -69,7 +64,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;
@@ -84,7 +79,7 @@ StreamSoundSource::update()
     play();
   }
 
-  if(fade_state == FadingOn) {
+  if(fade_state == FadingOn || fade_state == FadingResume) {
     float time = real_time - fade_start_time;
     if(time >= fade_time) {
       set_gain(1.0);
@@ -92,10 +87,13 @@ StreamSoundSource::update()
     } else {
       set_gain(time / fade_time);
     }
-  } else if(fade_state == FadingOff) {
+  } else if(fade_state == FadingOff || fade_state == FadingPause) {
     float time = real_time - fade_start_time;
     if(time >= fade_time) {
-      stop();
+      if(fade_state == FadingOff)
+        stop();
+      else
+        pause();
       fade_state = NoFading;
     } else {
       set_gain( (fade_time-time) / fade_time);
@@ -104,10 +102,10 @@ StreamSoundSource::update()
 }
 
 void
-StreamSoundSource::set_fading(FadeState state, float fade_time)
+StreamSoundSource::set_fading(FadeState state, float fade_time_)
 {
   this->fade_state = state;
-  this->fade_time = fade_time;
+  this->fade_time = fade_time_;
   this->fade_start_time = real_time;
 }
 
@@ -115,11 +113,11 @@ bool
 StreamSoundSource::fillBufferAndQueue(ALuint buffer)
 {
   // fill buffer
-  char* bufferdata = new char[STREAMFRAGMENTSIZE];
+  std::unique_ptr<char[]> bufferdata(new char[STREAMFRAGMENTSIZE]);
   size_t bytesread = 0;
   do {
-    bytesread += file->read(bufferdata + bytesread,
-        STREAMFRAGMENTSIZE - bytesread);
+    bytesread += file->read(bufferdata.get() + bytesread,
+                            STREAMFRAGMENTSIZE - bytesread);
     // end of sound file
     if(bytesread < STREAMFRAGMENTSIZE) {
       if(looping)
@@ -130,15 +128,16 @@ StreamSoundSource::fillBufferAndQueue(ALuint buffer)
   } while(bytesread < STREAMFRAGMENTSIZE);
 
   if(bytesread > 0) {
-    ALenum format = SoundManager::get_sample_format(file);
-    alBufferData(buffer, format, bufferdata, bytesread, file->rate);
+    ALenum format = SoundManager::get_sample_format(*file);
+    alBufferData(buffer, format, bufferdata.get(), bytesread, file->rate);
     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 */