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

[supertux.git] / src / audio / stream_sound_source.hpp

diff --git a/src/audio/stream_sound_source.hpp b/src/audio/stream_sound_source.hpp
index aa621b3..d3b3e94 100644 (file)
--- a/src/audio/stream_sound_source.hpp
+++ b/src/audio/stream_sound_source.hpp
@@ -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,15 +12,12 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __STREAM_SOUND_SOURCE_H__
-#define __STREAM_SOUND_SOURCE_H__
+#ifndef HEADER_SUPERTUX_AUDIO_STREAM_SOUND_SOURCE_HPP
+#define HEADER_SUPERTUX_AUDIO_STREAM_SOUND_SOURCE_HPP
 
-#include <stdio.h>
-#include <SDL.h>
-#include "openal_sound_source.hpp"
+#include "audio/openal_sound_source.hpp"
 
 class SoundFile;
 
@@ -56,7 +51,7 @@ private:
   static const size_t STREAMBUFFERSIZE = 1024 * 500;
   static const size_t STREAMFRAGMENTS = 5;
   static const size_t STREAMFRAGMENTSIZE
-    = STREAMBUFFERSIZE / STREAMFRAGMENTS;
+  = STREAMBUFFERSIZE / STREAMFRAGMENTS;
 
   bool fillBufferAndQueue(ALuint buffer);
   SoundFile* file;
@@ -66,6 +61,12 @@ private:
   float fade_start_time;
   float fade_time;
   bool looping;
+
+private:
+  StreamSoundSource(const StreamSoundSource&);
+  StreamSoundSource& operator=(const StreamSoundSource&);
 };
 
 #endif
+
+/* EOF */