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/osx/os_osx.h | |
| 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/osx/os_osx.h')
| -rw-r--r-- | platform/osx/os_osx.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 6c81da04f5..1f76b7f990 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -31,13 +31,11 @@ #define OS_OSX_H #include "crash_handler_osx.h" -#include "drivers/alsa/audio_driver_alsa.h" -#include "drivers/rtaudio/audio_driver_rtaudio.h" +#include "drivers/coreaudio/audio_driver_coreaudio.h" #include "drivers/unix/os_unix.h" #include "joypad_osx.h" #include "main/input_default.h" #include "os/input.h" -#include "platform/osx/audio_driver_osx.h" #include "power_osx.h" #include "servers/audio_server.h" #include "servers/physics_2d/physics_2d_server_sw.h" @@ -69,7 +67,7 @@ public: IP_Unix *ip_unix; - AudioDriverOSX audio_driver_osx; + AudioDriverCoreAudio audio_driver; InputDefault *input; JoypadOSX *joypad_osx; |