oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Max Kellermann
2021-03-04 17:50:53 +01:00
parent 428f769c38 0fd2c74a66
commit d4bbb8c851
15 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/Print.cxx
View File

@@ -40,8 +40,7 @@ printAudioDevices(Response &r, const MultipleOutputs &outputs)
ao.GetName(), ao.GetPluginName(),
ao.IsEnabled());
for (const auto &a : ao.GetAttributes())
r.Format("attribute: %s=%s\n",
a.first.c_str(), a.second.c_str());
for (const auto &[attribute, value] : ao.GetAttributes())
r.Format("attribute: %s=%s\n", attribute.c_str(), value.c_str());
}
}

8
src/output/plugins/WasapiOutputPlugin.cxx
View File

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