diff options
| author | Rémi Verschelde | 2017-01-16 19:19:45 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-16 19:19:45 +0100 |
| commit | 7b059965e8df745c5b45b4ec6bfbdfe1a7397642 (patch) | |
| tree | bdba6b41f51fcb4c8aa5178aebd378bdf97b93a8 /platform/javascript/os_javascript.h | |
| parent | 6a3dae5be944d9e226cca7bf0bd80fb0036e8324 (diff) | |
| download | godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.tar.gz godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.tar.zst godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.zip | |
Adapt platforms to AudioServer refactoring
Fixes compilation on Windows and likely other platforms (at least
as far as AudioServer changes were concerned), though they were
not tested.
Diffstat (limited to '')
| -rw-r--r-- | platform/javascript/os_javascript.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 370322e93..d11494a8a 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -35,15 +35,16 @@ #include "servers/physics/physics_server_sw.h" #include "servers/spatial_sound/spatial_sound_server_sw.h" #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" -#include "servers/audio/audio_server_sw.h" +#include "servers/audio_server.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/visual/rasterizer.h" #include "audio_server_javascript.h" #include "audio_driver_javascript.h" #include "main/input_default.h" -#include "emscripten/html5.h" #include "javascript_eval.h" +#include <emscripten/html5.h> + typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); typedef String (*GetDataDirFunc)(); @@ -71,10 +72,6 @@ private: Rasterizer *rasterizer; VisualServer *visual_server; - AudioServerJavascript *audio_server; - //SampleManagerMallocSW *sample_manager; - SpatialSoundServerSW *spatial_sound_server; - SpatialSound2DServerSW *spatial_sound_2d_server; PhysicsServer *physics_server; Physics2DServer *physics_2d_server; AudioDriverJavaScript audio_driver_javascript; |
