X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.cpp;h=e463acca35558befa089708ef93b5b3d8407d842;hb=d8496f30a608d6827fefdfe33234acb6f4d8f0fe;hp=8e0d558e7a4bec2b0d6e5bbe7bed2c882edf9515;hpb=20ca5e7c49d7d98aee81921ea706829e5ff231ed;p=supertux.git

diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp
index 8e0d558e7..e463acca3 100644
--- a/src/audio/sound_manager.cpp
+++ b/src/audio/sound_manager.cpp
@@ -25,6 +25,7 @@
 #include <sstream>
 
 #include "audio/sound_manager.h"
+
 #include "audio/musicref.h"
 #include "moving_object.h"
 #include "resources.h"
@@ -43,20 +44,6 @@ SoundManager::~SoundManager()
   sounds.clear();
 }
 
-void
-SoundManager::play_sound(const std::string& name)
-{
-  if(!audio_device || !m_sound_enabled)
-    return;
-  
-  Mix_Chunk* chunk = preload_sound(name);
-  if(chunk == 0) {
-    std::cerr << "Sound '" << name << "' not found.\n";
-    return;
-  }
-  Mix_PlayChannel(-1, chunk, 0);  
-}
-
 int
 SoundManager::play_sound(const std::string& name,int loops)
 {
@@ -71,6 +58,7 @@ SoundManager::play_sound(const std::string& name,int loops)
   return Mix_PlayChannel(-1, chunk, loops);  
 }
 
+
 void
 SoundManager::play_sound(const std::string& sound, const MovingObject* object,
     const Vector& pos)
@@ -112,38 +100,6 @@ 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)
 {