diff options
author | bunnei <bunneidev@gmail.com> | 2019-03-10 17:26:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-10 17:26:20 -0400 |
commit | add8b1df6802cba4b27599eb9920fb552949c38c (patch) | |
tree | f101566b580e5424ede52e06b53d6643a395e6a3 | |
parent | 0ea27718898e0a6327f96198ea4f315d06187a1e (diff) | |
parent | 4a4e87e971a348198c12c32e59372f42fabfc1b7 (diff) |
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 @@ #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 }; |