From 4a4e87e971a348198c12c32e59372f42fabfc1b7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 9 Mar 2019 18:05:58 -0500
Subject: [PATCH] audio_core/cubeb_sink: Convert _MSC_VER ifdefs to _WIN32
This behavior also needs to be visible for MinGW builds as well.
---
src/audio_core/cubeb_sink.cpp | 6 +++---
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 1da0b9f2a3..7047ed9cf6 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 511df7bb1f..7ce850f475 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
};
--
GitLab