yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #2220 from lioncash/cubeb 

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

2
src/audio_core/cubeb_sink.h
View File

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