New Path based on time intervals; see levels/test/platform.stl

[supertux.git] / src / object / ambient_sound.cpp

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index ad5b896..3b8093e 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -19,15 +19,18 @@
 #include <config.h>
 
 #include <math.h>
+#include <stdexcept>
+#include <iostream>
 
-#include "ambient_sound.h"
-#include "object_factory.h"
-#include "lisp/lisp.h"
-#include "sector.h"
+#include "ambient_sound.hpp"
+#include "object_factory.hpp"
+#include "lisp/lisp.hpp"
+#include "sector.hpp"
+#include "audio/sound_manager.hpp"
+#include "audio/sound_source.hpp"
 
 AmbientSound::AmbientSound(const lisp::Lisp& lisp)
 {
-
   position.x=0;
   position.y=0;
 
@@ -72,13 +75,12 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   
   lisp.get("silence_distance",silence_distance);
 
-  playing=-1; // not playing at the beginning
+  sound_source = 0; // not playing at the beginning
   latency=0;
 }
 
 AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file)
 {
-
   position.x=pos.x;
   position.y=pos.y;
 
@@ -97,7 +99,7 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   else
     silence_distance = 1/distance_factor;
 
-  playing=-1; // not playing at the beginning
+  sound_source = 0; // not playing at the beginning
   latency=0;
 }
 
@@ -112,18 +114,27 @@ AmbientSound::hit(Player& )
 
 void
 AmbientSound::stop_playing() {
-  if (playing>=0) {
-    Mix_HaltChannel(playing);
-    playing=-1;
-  }
+  delete sound_source;
+  sound_source = 0;
 }
 
 void
 AmbientSound::start_playing()
 {
-  playing=sound_manager->play_sound(sample,-1);
-  Mix_Volume(playing,0);
-  currentvolume=targetvolume=1e-20;
+  try {
+    sound_source = sound_manager->create_sound_source(sample);
+    if(!sound_source)
+      throw std::runtime_error("file not found");
+   
+    sound_source->set_gain(0);
+    sound_source->set_looping(true);
+    currentvolume=targetvolume=1e-20;
+    sound_source->play();
+  } catch(std::exception& e) {
+    std::cerr << "Couldn't play '" << sample << "': " << e.what() << "\n";
+    delete sound_source;
+    sound_source = 0;
+  }
 }
 
 void
@@ -168,10 +179,10 @@ AmbientSound::update(float deltat)
     currentvolume*=pow(rise,deltat*10);
     currentvolume += 1e-6; // volume is at least 1e-6 (0 would never rise)
 
-    if (playing>=0) {
+    if (sound_source != 0) {
 
       // set the volume
-      Mix_Volume(playing,(int)(currentvolume*maximumvolume*MIX_MAX_VOLUME));
+      sound_source->set_gain(currentvolume*maximumvolume);
 
       if (sqrdistance>=silence_distance && currentvolume<1e-3)
        stop_playing();