diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /servers/audio | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
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 60af87e6f4..c416d3393f 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 c0b5661a1c..ad71723cd6 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; |