diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-10 22:26:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-10 22:26:20 +0100 |
| commit | add8b1df6802cba4b27599eb9920fb552949c38c (patch) | |
| tree | f101566b580e5424ede52e06b53d6643a395e6a3 /src | |
| 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 yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.gz yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.bz2 yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.lz yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.xz yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.tar.zst yuzu-add8b1df6802cba4b27599eb9920fb552949c38c.zip | |
Diffstat (limited to 'src')
| -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 @@ #include "common/ring_buffer.h" #include "core/settings.h" -#ifdef _MSC_VER +#ifdef _WIN32 #include <objbase.h> #endif @@ -113,7 +113,7 @@ private: CubebSink::CubebSink(std::string_view target_device_name) { // Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows -#ifdef _MSC_VER +#ifdef _WIN32 com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); #endif @@ -152,7 +152,7 @@ CubebSink::~CubebSink() { cubeb_destroy(ctx); -#ifdef _MSC_VER +#ifdef _WIN32 if (SUCCEEDED(com_init_result)) { CoUninitialize(); } 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: cubeb_devid output_device{}; std::vector<SinkStreamPtr> sink_streams; -#ifdef _MSC_VER +#ifdef _WIN32 u32 com_init_result = 0; #endif }; |