lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-29 23:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2220 from lioncash/cubeb

Browse source 
audio_core/cubeb_sink: Convert _MSC_VER ifdefs to _WIN32
This commit is contained in:
bunnei 2019-03-10 17:26:20 -04:00 committed by GitHub
parent 0ea2771889 4a4e87e971
commit add8b1df68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/audio_core/cubeb_sink.cpp
View file

@ -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();
}

2
src/audio_core/cubeb_sink.h
View file

@ -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
};