Merge branch 'struc' of git://github.com/neheb/MPD

2021-03-04 17:50:53 +01:00
parent 428f769c38 0fd2c74a66
commit d4bbb8c851
15 changed files with 49 additions and 61 deletions
--- a/src/output/plugins/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/WasapiOutputPlugin.cxx
@@ -323,9 +323,11 @@ void WasapiOutput::Enable() {
 	device.reset();

 	if (enumerate_devices && SafeTry([this]() { EnumerateDevices(); })) {
-		for (const auto &desc : device_desc) {
-			FormatNotice(wasapi_output_domain, "Device \"%u\" \"%s\"",
-				     desc.first, desc.second.c_str());
+		for (const auto &[device, desc] : device_desc) {
+			FormatNotice(wasapi_output_domain,
+				     "Device \"%u\" \"%s\"",
+				     device,
+				     desc.c_str());
 		}
 	}