mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 13:50:41 +02:00
Merge pull request #2220 from lioncash/cubeb
audio_core/cubeb_sink: Convert _MSC_VER ifdefs to _WIN32
This commit is contained in:
commit
add8b1df68
@ -12,7 +12,7 @@
|
|||||||
#include "common/ring_buffer.h"
|
#include "common/ring_buffer.h"
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _WIN32
|
||||||
#include <objbase.h>
|
#include <objbase.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -113,7 +113,7 @@ private:
|
|||||||
|
|
||||||
CubebSink::CubebSink(std::string_view target_device_name) {
|
CubebSink::CubebSink(std::string_view target_device_name) {
|
||||||
// Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows
|
// 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);
|
com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -152,7 +152,7 @@ CubebSink::~CubebSink() {
|
|||||||
|
|
||||||
cubeb_destroy(ctx);
|
cubeb_destroy(ctx);
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _WIN32
|
||||||
if (SUCCEEDED(com_init_result)) {
|
if (SUCCEEDED(com_init_result)) {
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ private:
|
|||||||
cubeb_devid output_device{};
|
cubeb_devid output_device{};
|
||||||
std::vector<SinkStreamPtr> sink_streams;
|
std::vector<SinkStreamPtr> sink_streams;
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _WIN32
|
||||||
u32 com_init_result = 0;
|
u32 com_init_result = 0;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user