Fix music not properly fading in again

[supertux.git] / src / audio / openal_sound_source.cpp

diff --git a/src/audio/openal_sound_source.cpp b/src/audio/openal_sound_source.cpp
index e5c5861..ceec5bf 100644 (file)
--- a/src/audio/openal_sound_source.cpp
+++ b/src/audio/openal_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,14 +12,14 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "audio/openal_sound_source.hpp"
 
-#include "openal_sound_source.hpp"
-#include "sound_manager.hpp"
+#include "audio/sound_manager.hpp"
 
-OpenALSoundSource::OpenALSoundSource()
+OpenALSoundSource::OpenALSoundSource() :
+  source()
 {
   alGenSources(1, &source);
   SoundManager::check_al_error("Couldn't create audio source: ");
@@ -31,7 +29,6 @@ OpenALSoundSource::OpenALSoundSource()
 OpenALSoundSource::~OpenALSoundSource()
 {
   stop();
-  alSourcei(source, AL_BUFFER, AL_NONE);
   alDeleteSources(1, &source);
 }
 
@@ -39,6 +36,7 @@ void
 OpenALSoundSource::stop()
 {
   alSourceStop(source);
+  alSourcei(source, AL_BUFFER, AL_NONE);
   SoundManager::check_al_error("Problem stopping audio source: ");
 }
 
@@ -58,6 +56,32 @@ OpenALSoundSource::playing()
 }
 
 void
+OpenALSoundSource::pause()
+{
+  alSourcePause(source);
+  SoundManager::check_al_error("Couldn't pause audio source: ");
+}
+
+void
+OpenALSoundSource::resume()
+{
+  if( !this->paused() )
+  {
+    return;
+  }
+
+  this->play();
+}
+
+bool
+OpenALSoundSource::paused()
+{
+    ALint state = AL_PAUSED;
+    alGetSourcei(source, AL_SOURCE_STATE, &state);
+    return state == AL_PAUSED;
+}
+
+void
 OpenALSoundSource::update()
 {
 }
@@ -69,6 +93,12 @@ OpenALSoundSource::set_looping(bool looping)
 }
 
 void
+OpenALSoundSource::set_relative(bool relative)
+{
+  alSourcei(source, AL_SOURCE_RELATIVE, relative ? AL_TRUE : AL_FALSE);
+}
+
+void
 OpenALSoundSource::set_position(const Vector& position)
 {
   alSource3f(source, AL_POSITION, position.x, position.y, 0);
@@ -98,8 +128,4 @@ OpenALSoundSource::set_reference_distance(float distance)
   alSourcef(source, AL_REFERENCE_DISTANCE, distance);
 }
 
-void
-OpenALSoundSource::set_rollof_factor(float factor)
-{
-  alSourcef(source, AL_ROLLOFF_FACTOR, factor);
-}
+/* EOF */