+// $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 <config.h>
#include <assert.h>
#include "stream_sound_source.hpp"
#include "sound_manager.hpp"
#include "sound_file.hpp"
-#include "msg.hpp"
+#include "timer.hpp"
+#include "log.hpp"
StreamSoundSource::StreamSoundSource()
: file(0), fade_state(NoFading), 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);
SoundManager::check_al_error("Couldn't delete audio buffers: ");
}
if(!playing()) {
if(processed == 0 || !looping)
return;
-
- // we might have to restart the source if we had a buffer underrun
- msg_info("Restarting audio source because of 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;
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;
{
this->fade_state = state;
this->fade_time = fade_time;
- this->fade_start_ticks = SDL_GetTicks();
+ this->fade_start_time = real_time;
}
bool
// return false if there aren't more buffers to fill
return bytesread >= STREAMFRAGMENTSIZE;
}
-