Switched magnification to percentage, added black-border as alternative to scale

[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..aa621b3 100644 (file)
--- a/src/audio/stream_sound_source.hpp
+++ b/src/audio/stream_sound_source.hpp
@@ -1,13 +1,32 @@
+//  $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.
+
 #ifndef __STREAM_SOUND_SOURCE_H__
 #define __STREAM_SOUND_SOURCE_H__
 
 #include <stdio.h>
 #include <SDL.h>
-#include "sound_source.hpp"
+#include "openal_sound_source.hpp"
 
 class SoundFile;
 
-class StreamSoundSource : public SoundSource
+class StreamSoundSource : public OpenALSoundSource
 {
 public:
   StreamSoundSource();
@@ -32,11 +51,11 @@ public:
   {
     return looping;
   }
-  
+
 private:
   static const size_t STREAMBUFFERSIZE = 1024 * 500;
   static const size_t STREAMFRAGMENTS = 5;
-  static const size_t STREAMFRAGMENTSIZE 
+  static const size_t STREAMFRAGMENTSIZE
     = STREAMBUFFERSIZE / STREAMFRAGMENTS;
 
   bool fillBufferAndQueue(ALuint buffer);
@@ -44,10 +63,9 @@ private:
   ALuint buffers[STREAMFRAGMENTS];
 
   FadeState fade_state;
-  Uint32 fade_start_ticks;
+  float fade_start_time;
   float fade_time;
   bool looping;
 };
 
 #endif
-