summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-09-10 20:30:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-09-10 20:30:46 -0300
commit83b69f8fefcc91a1d71b726e7a02623b21386f2b (patch)
tree2ddf134b6e88071488f58655b649b0f8db4abb4b /platform
parent3013a83f2f8b9afdc0301b6a05eadf6d7a49cf74 (diff)
remotion of some c++ includes to avoid dependency on libstdc++
Diffstat (limited to 'platform')
-rw-r--r--platform/javascript/audio_server_javascript.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp
index 8fa76d5aee..fd505b8a8f 100644
--- a/platform/javascript/audio_server_javascript.cpp
+++ b/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){