diff options
| author | Poommetee Ketson <poommetee@protonmail.com> | 2017-10-02 23:37:55 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 23:37:55 +0700 |
| commit | 3f4e973a60e20051bf4a51a93048d84d2c83a0c9 (patch) | |
| tree | ab216bf42a21b9f1bc51dec677c8760bd77d8549 /platform/iphone/os_iphone.cpp | |
| parent | fcc209590977f486243860c48957a518bdd37564 (diff) | |
| parent | 12d40fa03f95cccfb6af994b03576f78af314891 (diff) | |
Merge pull request #11716 from marcelofg55/coreaudio_driver
Merged iphone and osx audio drivers into drivers/coreaudio
Diffstat (limited to 'platform/iphone/os_iphone.cpp')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 0e3eeed114..086cbe5010 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -35,7 +35,6 @@ #include "servers/visual/visual_server_raster.h" //#include "servers/visual/visual_server_wrap_mt.h" -#include "audio_driver_iphone.h" #include "main/main.h" #include "core/io/file_access_pack.h" @@ -124,9 +123,8 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_ // reset this to what it should be, it will have been set to 0 after visual_server->init() is called RasterizerStorageGLES3::system_fbo = gl_view_base_fb; - audio_driver = memnew(AudioDriverIphone); - audio_driver->set_singleton(); - audio_driver->init(); + AudioDriverManager::add_driver(&audio_driver); + AudioDriverManager::initialize(p_audio_driver); // init physics servers physics_server = memnew(PhysicsServerSW); |