Browse Source
Merge pull request #9758 from german77/multi_audio
audio: cubeb: Fix yuzu crashing when it test for latency
pull/15/merge
liamwhite
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
20 additions and
0 deletions
-
src/audio_core/sink/cubeb_sink.cpp
|
|
|
@ -302,11 +302,21 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) { |
|
|
|
std::vector<std::string> device_list; |
|
|
|
cubeb* ctx; |
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); |
|
|
|
#endif
|
|
|
|
|
|
|
|
if (cubeb_init(&ctx, "yuzu Device Enumerator", nullptr) != CUBEB_OK) { |
|
|
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); |
|
|
|
return {}; |
|
|
|
} |
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
if (SUCCEEDED(com_init_result)) { |
|
|
|
CoUninitialize(); |
|
|
|
} |
|
|
|
#endif
|
|
|
|
|
|
|
|
auto type{capture ? CUBEB_DEVICE_TYPE_INPUT : CUBEB_DEVICE_TYPE_OUTPUT}; |
|
|
|
cubeb_device_collection collection; |
|
|
|
if (cubeb_enumerate_devices(ctx, type, &collection) != CUBEB_OK) { |
|
|
|
@ -329,12 +339,22 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) { |
|
|
|
u32 GetCubebLatency() { |
|
|
|
cubeb* ctx; |
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); |
|
|
|
#endif
|
|
|
|
|
|
|
|
if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) { |
|
|
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); |
|
|
|
// Return a large latency so we choose SDL instead.
|
|
|
|
return 10000u; |
|
|
|
} |
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
if (SUCCEEDED(com_init_result)) { |
|
|
|
CoUninitialize(); |
|
|
|
} |
|
|
|
#endif
|
|
|
|
|
|
|
|
cubeb_stream_params params{}; |
|
|
|
params.rate = TargetSampleRate; |
|
|
|
params.channels = 2; |
|
|
|
|