Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[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..530f905 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,13 @@
 //  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 "openal_sound_source.hpp"
-#include "sound_manager.hpp"
+#include "audio/openal_sound_source.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 +28,6 @@ OpenALSoundSource::OpenALSoundSource()
 OpenALSoundSource::~OpenALSoundSource()
 {
   stop();
-  alSourcei(source, AL_BUFFER, AL_NONE);
   alDeleteSources(1, &source);
 }
 
@@ -39,6 +35,7 @@ void
 OpenALSoundSource::stop()
 {
   alSourceStop(source);
+  alSourcei(source, AL_BUFFER, AL_NONE);
   SoundManager::check_al_error("Problem stopping audio source: ");
 }
 
@@ -103,3 +100,5 @@ OpenALSoundSource::set_rollof_factor(float factor)
 {
   alSourcef(source, AL_ROLLOFF_FACTOR, factor);
 }
+
+/* EOF */