diff options
| author | 2019-03-10 17:26:20 -0400 | |
|---|---|---|
| committer | 2019-03-10 17:26:20 -0400 | |
| commit | add8b1df6802cba4b27599eb9920fb552949c38c (patch) | |
| tree | f101566b580e5424ede52e06b53d6643a395e6a3 | |
| parent | Merge pull request #2217 from ReinUsesLisp/rasterizer-logger (diff) | |
| parent | audio_core/cubeb_sink: Convert _MSC_VER ifdefs to _WIN32 (diff) | |
| download | yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.gz yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.xz yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.zip | |
Merge pull request #2220 from lioncash/cubeb
audio_core/cubeb_sink: Convert _MSC_VER ifdefs to _WIN32
| -rw-r--r-- | src/audio_core/cubeb_sink.cpp | 6 | ||||
| -rw-r--r-- | src/audio_core/cubeb_sink.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 1da0b9f2a..7047ed9cf 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "common/ring_buffer.h" | 12 | #include "common/ring_buffer.h" |
| 13 | #include "core/settings.h" | 13 | #include "core/settings.h" |
| 14 | 14 | ||
| 15 | #ifdef _MSC_VER | 15 | #ifdef _WIN32 |
| 16 | #include <objbase.h> | 16 | #include <objbase.h> |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| @@ -113,7 +113,7 @@ private: | |||
| 113 | 113 | ||
| 114 | CubebSink::CubebSink(std::string_view target_device_name) { | 114 | CubebSink::CubebSink(std::string_view target_device_name) { |
| 115 | // Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows | 115 | // Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows |
| 116 | #ifdef _MSC_VER | 116 | #ifdef _WIN32 |
| 117 | com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); | 117 | com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); |
| 118 | #endif | 118 | #endif |
| 119 | 119 | ||
| @@ -152,7 +152,7 @@ CubebSink::~CubebSink() { | |||
| 152 | 152 | ||
| 153 | cubeb_destroy(ctx); | 153 | cubeb_destroy(ctx); |
| 154 | 154 | ||
| 155 | #ifdef _MSC_VER | 155 | #ifdef _WIN32 |
| 156 | if (SUCCEEDED(com_init_result)) { | 156 | if (SUCCEEDED(com_init_result)) { |
| 157 | CoUninitialize(); | 157 | CoUninitialize(); |
| 158 | } | 158 | } |
diff --git a/src/audio_core/cubeb_sink.h b/src/audio_core/cubeb_sink.h index 511df7bb1..7ce850f47 100644 --- a/src/audio_core/cubeb_sink.h +++ b/src/audio_core/cubeb_sink.h | |||
| @@ -26,7 +26,7 @@ private: | |||
| 26 | cubeb_devid output_device{}; | 26 | cubeb_devid output_device{}; |
| 27 | std::vector<SinkStreamPtr> sink_streams; | 27 | std::vector<SinkStreamPtr> sink_streams; |
| 28 | 28 | ||
| 29 | #ifdef _MSC_VER | 29 | #ifdef _WIN32 |
| 30 | u32 com_init_result = 0; | 30 | u32 com_init_result = 0; |
| 31 | #endif | 31 | #endif |
| 32 | }; | 32 | }; |