Fixed missing header in stream_sound_source.cpp

SVN-Revision: 2690

diff --git a/contrib/sounds/csound/Makefile b/contrib/sounds/csound/Makefile
index 021dc55..80f1fa0 100644 (file)
--- a/contrib/sounds/csound/Makefile
+++ b/contrib/sounds/csound/Makefile
@@ -2,14 +2,17 @@
 CSOUND = /usr/bin/csound
 SOX = /usr/bin/sox
 
-sounds: bubble.wav rain.wav lava.wav waterfall.wav flower.wav wind.wav
+sounds: bubble.ogg rain.ogg lava.ogg waterfall.ogg flower.ogg wind.ogg splash.ogg
 
-%.wav: %.sco sfx.orc 
-       $(CSOUND) sfx.orc $< -W -o $@.1 -g
-       $(SOX) -r 22100 -s $@.1 $@
-       rm $@.1
+%.ogg: %.sco sfx.orc 
+       $(CSOUND) sfx.orc $< -W -o $*.wav -g -s
+       oggenc $*.wav
+       rm $*.wav
+        
 
 clean: 
+       rm *.ogg
        rm *.wav
        rm *~
 
+

diff --git a/contrib/sounds/csound/lava.sco b/contrib/sounds/csound/lava.sco
index 098d808..eb3dcb1 100644 (file)
--- a/contrib/sounds/csound/lava.sco
+++ b/contrib/sounds/csound/lava.sco
@@ -2,7 +2,7 @@
 ; lava 
 
 ;i1 0 1 100 3000 3000 2
-i1 0 3 100 1000 3000 1 
+i1 0 3 200 1000 3000 1 
 ;i1 0 1 100 500 500 0.5
 ;i1 0 1 50 500 500 0.5
 ;i1 0 1 100 3000 1000 0.5

diff --git a/contrib/sounds/csound/sfx.orc b/contrib/sounds/csound/sfx.orc
index 08982d2..659e764 100644 (file)
--- a/contrib/sounds/csound/sfx.orc
+++ b/contrib/sounds/csound/sfx.orc
@@ -117,4 +117,20 @@ instr 5 ; Wind
        aout    butterlp aout,10000,0.7
        aout    phaser2 aout,ifqc*kfmanip,0.7,1,0.2,0.5
        out aout*kvol*(kfmanip/2.5)
+endin
+
+instr 6 
+       aout1 dripwater 1,0.1,50,1.98,300,350,430
+       aout2 dripwater 1,0.1,50,1.98,400,440,580
+       aout3 dripwater 1,0.1,50,1.98,500,530,600
+       aout4 dripwater 1,0.1,200,1.96,300,350,430
+       aout5 dripwater 1,0.1,200,1.96,400,440,580
+       aout6 dripwater 1,0.1,200,1.96,500,530,600
+
+       aout =aout1+aout2+aout3+aout4+aout5+aout6
+       aout2 oscili 1,100+aout/10000,1
+       aout2 =aout2*aout/1000+aout/1000
+       aout = aout2
+       aout butterlp aout,5000,0.4
+       out aout
 endin
\ No newline at end of file

diff --git a/src/audio/stream_sound_source.cpp b/src/audio/stream_sound_source.cpp
index 6119796..4e3b5d0 100644 (file)
--- a/src/audio/stream_sound_source.cpp
+++ b/src/audio/stream_sound_source.cpp
@@ -1,6 +1,8 @@
 #include <config.h>
+#include <assert.h>
 
 #include <SDL.h>
+
 #include "stream_sound_source.hpp"
 #include "sound_manager.hpp"
 #include "sound_file.hpp"