diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-10-03 16:33:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-03 21:35:16 +0200 |
| commit | 22d83bc9f655d5ae7a1b49709c4c1b663725daf5 (patch) | |
| tree | a817195c08d4713a70ca014a3f63f5937934fe36 /servers/audio | |
| parent | 78d97b060a6873a454e710380cb9ef1bde5e4c65 (diff) | |
Begining of GLES3 renderer:
-Most 2D drawing is implemented
-Missing shaders
-Missing all 3D
-Editor needs to be set on update always to be used, otherwise it does not refresh
-Large parts of editor not working
Diffstat (limited to 'servers/audio')
| -rw-r--r-- | servers/audio/audio_server_sw.h | 4 | ||||
| -rw-r--r-- | servers/audio/sample_manager_sw.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/servers/audio/audio_server_sw.h b/servers/audio/audio_server_sw.h index fda952fa94..2f56479404 100644 --- a/servers/audio/audio_server_sw.h +++ b/servers/audio/audio_server_sw.h @@ -53,7 +53,7 @@ class AudioServerSW : public AudioServer { virtual AudioMixer *get_mixer(); virtual void audio_mixer_chunk_callback(int p_frames); - struct Voice { + struct Voice : public RID_Data { float volume; volatile bool active; @@ -67,7 +67,7 @@ class AudioServerSW : public AudioServer { mutable RID_Owner<Voice> voice_owner; SelfList<Voice>::List active_list; - struct Stream { + struct Stream : public RID_Data { bool active; List<Stream*>::Element *E; AudioStream *audio_stream; diff --git a/servers/audio/sample_manager_sw.h b/servers/audio/sample_manager_sw.h index bd7a11a3d2..6ca3a8e8fb 100644 --- a/servers/audio/sample_manager_sw.h +++ b/servers/audio/sample_manager_sw.h @@ -74,7 +74,7 @@ public: class SampleManagerMallocSW : public SampleManagerSW { - struct Sample { + struct Sample : public RID_Data { void *data; int length; |