octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4248 from FearlessTobi/port-1321

Browse Source 
Port yuzu-emu/yuzu#1321: "cubeb_sink: Get rid of variable shadowing within CubebSink's constructor"
This commit is contained in:
Weiyi Wang
2018-09-22 12:02:06 -04:00
committed by GitHub
parent 80cdfe1c45 bcb1aaf05c
commit 6d4a8a21db
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio_core/cubeb_sink.cpp
View File

@@ -53,11 +53,11 @@ CubebSink::CubebSink(std::string target_device_name) : impl(std::make_unique<Imp
if (cubeb_enumerate_devices(impl->ctx, CUBEB_DEVICE_TYPE_OUTPUT, &collection) != CUBEB_OK) {
LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported");
} else {
const auto collection_end = collection.device + collection.count;
const auto device = std::find_if(collection.device, collection_end,
[&](const cubeb_device_info& device) {
return target_device_name == device.friendly_name;
});
const auto collection_end{collection.device + collection.count};
const auto device{
std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
return target_device_name == info.friendly_name;
})};
if (device != collection_end) {
output_device = device->devid;
}