Merge pull request #1321 from lioncash/audio-shadow

cubeb_sink: Get rid of variable shadowing within CubebSink's constructor
This commit is contained in:
bunnei 2018-09-17 12:26:29 -04:00 committed by GitHub
commit 59beb540ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -119,9 +119,9 @@ CubebSink::CubebSink(std::string target_device_name) {
LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported"); LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported");
} else { } else {
const auto collection_end{collection.device + collection.count}; const auto collection_end{collection.device + collection.count};
const auto device{std::find_if(collection.device, collection_end, const auto device{
[&](const cubeb_device_info& device) { std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
return target_device_name == device.friendly_name; return target_device_name == info.friendly_name;
})}; })};
if (device != collection_end) { if (device != collection_end) {
output_device = device->devid; output_device = device->devid;