diff options
| author | Kostadin Damyanov | 2015-10-13 05:01:54 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-10-13 05:01:54 +0300 |
| commit | 29caf2bb5be061cd1ab014cf938f2c71d0bd2663 (patch) | |
| tree | 859a0c3d2805198672c1e22d4780c3eb68f55a57 /platform/javascript/os_javascript.h | |
| parent | c5f574b914b3cb11d97ae616df4a0bced45bb17c (diff) | |
| parent | 79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff) | |
| download | godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.tar.gz godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.tar.zst godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/javascript/os_javascript.h')
| -rw-r--r-- | platform/javascript/os_javascript.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 81bb47440..1e925fb8d 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -38,8 +38,9 @@ #include "servers/audio/audio_server_sw.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" typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); typedef int (*OpenURIFunc)(const String&); @@ -65,10 +66,13 @@ private: bool use_gl2; + int64_t time_to_save_sync; + int64_t last_sync_time; + Rasterizer *rasterizer; VisualServer *visual_server; - AudioServerSW *audio_server; - SampleManagerMallocSW *sample_manager; + AudioServerJavascript *audio_server; + //SampleManagerMallocSW *sample_manager; SpatialSoundServerSW *spatial_sound_server; SpatialSound2DServerSW *spatial_sound_2d_server; PhysicsServer *physics_server; @@ -84,6 +88,8 @@ private: GetDataDirFunc get_data_dir_func; GetLocaleFunc get_locale_func; + static void _close_notification_funcs(const String& p_file,int p_flags); + public: // functions used by main to initialize/deintialize the OS @@ -106,7 +112,7 @@ public: typedef int64_t ProcessID; - static OS* get_singleton(); + //static OS* get_singleton(); virtual void vprint(const char* p_format, va_list p_list, bool p_stderr=false); virtual void print(const char *p_format, ... ); |