SVN-Revision: 2418

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

diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp
index 9d2883e..8e0d558 100644 (file)
--- a/src/audio/sound_manager.cpp
+++ b/src/audio/sound_manager.cpp
@@ -57,6 +57,20 @@ SoundManager::play_sound(const std::string& name)
   Mix_PlayChannel(-1, chunk, 0);  
 }
 
+int
+SoundManager::play_sound(const std::string& name,int loops)
+{
+  if(!audio_device || !m_sound_enabled)
+    return -1;
+  
+  Mix_Chunk* chunk = preload_sound(name);
+  if(chunk == 0) {
+    std::cerr << "Sound '" << name << "' not found.\n";
+    return -1;
+  }
+  return Mix_PlayChannel(-1, chunk, loops);  
+}
+
 void
 SoundManager::play_sound(const std::string& sound, const MovingObject* object,
     const Vector& pos)
@@ -98,6 +112,38 @@ SoundManager::play_sound(const std::string& sound, const Vector& pos,
     Mix_SetPanning(chan, 24, 230);
 }
 
+// Register a sound effect function - basti_
+
+void 
+SoundManager::register_effect(int channel,Mix_EffectFunc_t f,
+                             Mix_EffectDone_t d,void * arg) {
+
+  if(!audio_device || !m_sound_enabled)
+    return;
+  Mix_RegisterEffect(channel,f,d,arg);
+}
+
+// Adjust the Volume of a channel "on line". Needs sizeof(float) static data.
+
+#define __ATYPE__ signed short int
+
+void 
+SoundManager::volume_adjust(int chan, void *stream, int len, void *udata) {
+  ((float *)udata)[1]=((float *)udata)[1]*0.95+
+    (((float *)udata)[0]-
+     ((float *)udata)[1])*0.05; // decay towards [0] - declick
+  float vol=((float*)udata)[1];
+
+  for (int i=0;i<len/2;i++)
+    ((__ATYPE__ *)stream)[i]=
+      ((__ATYPE__)(((signed short int *)stream)[i]*vol)); 
+  // FIXME: This should be audio-type dependant - how to do this correctly?
+  
+  chan=0; // -Werror sucks
+}
+
+
+
 MusicRef
 SoundManager::load_music(const std::string& file)
 {