Sfoglia il codice sorgente

remotion of some c++ includes to avoid dependency on libstdc++

Juan Linietsky 10 anni fa
parent
commit
83b69f8fef

+ 2 - 1
drivers/convex_decomp/b2Glue.h

@@ -20,7 +20,8 @@
 #define B2GLUE_H
 
 #include "math_2d.h"
-#include <limits>
+#include <limits.h>
+
 namespace b2ConvexDecomp {
 
 typedef real_t float32;

+ 1 - 1
drivers/convex_decomp/b2Polygon.h

@@ -22,7 +22,7 @@
 #include "b2Triangle.h"
 #include "stdio.h"
 #include <string.h>
-#include <limits>
+#include <limits.h>
 namespace b2ConvexDecomp {
 
 static bool B2_POLYGON_REPORT_ERRORS = false;

+ 7 - 4
platform/javascript/audio_server_javascript.cpp

@@ -626,11 +626,14 @@ void AudioServerJavascript::finish(){
 }
 void AudioServerJavascript::update(){
 
-	for(List<Stream*>::Element *E=active_audio_streams.front();E;E=E->next()) {
+	for(List<Stream*>::Element *E=active_audio_streams.front();E;) { //stream might be removed durnig this callback
+
+		List<Stream*>::Element *N=E->next();
 
-		if (E->get()->audio_stream ) {
+		if (E->get()->audio_stream)
 			E->get()->audio_stream->update();
-		}
+
+		E=N;
 	}
 }
 
@@ -653,7 +656,7 @@ int AudioServerJavascript::get_default_mix_rate() const{
 
 void AudioServerJavascript::set_stream_global_volume_scale(float p_volume){
 
-
+	stream_volume_scale=p_volume;
 }
 void AudioServerJavascript::set_fx_global_volume_scale(float p_volume){