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 657405c..d3b3e94 100644 (file)
--- a/src/audio/stream_sound_source.hpp
+++ b/src/audio/stream_sound_source.hpp
@@ -1,13 +1,27 @@
-#ifndef __STREAM_SOUND_SOURCE_H__
-#define __STREAM_SOUND_SOURCE_H__
+//  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 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
+//  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, see <http://www.gnu.org/licenses/>.
 
-#include <stdio.h>
-#include <SDL.h>
-#include "sound_source.hpp"
+#ifndef HEADER_SUPERTUX_AUDIO_STREAM_SOUND_SOURCE_HPP
+#define HEADER_SUPERTUX_AUDIO_STREAM_SOUND_SOURCE_HPP
+
+#include "audio/openal_sound_source.hpp"
 
 class SoundFile;
 
-class StreamSoundSource : public SoundSource
+class StreamSoundSource : public OpenALSoundSource
 {
 public:
   StreamSoundSource();
@@ -32,22 +46,27 @@ public:
   {
     return looping;
   }
-  
+
 private:
   static const size_t STREAMBUFFERSIZE = 1024 * 500;
   static const size_t STREAMFRAGMENTS = 5;
-  static const size_t STREAMFRAGMENTSIZE 
-    = STREAMBUFFERSIZE / STREAMFRAGMENTS;
+  static const size_t STREAMFRAGMENTSIZE
+  = STREAMBUFFERSIZE / STREAMFRAGMENTS;
 
   bool fillBufferAndQueue(ALuint buffer);
   SoundFile* file;
   ALuint buffers[STREAMFRAGMENTS];
 
   FadeState fade_state;
-  Uint32 fade_start_ticks;
+  float fade_start_time;
   float fade_time;
   bool looping;
+
+private:
+  StreamSoundSource(const StreamSoundSource&);
+  StreamSoundSource& operator=(const StreamSoundSource&);
 };
 
 #endif
 
+/* EOF */