diff options
| author | Max Kellermann <max@musicpd.org> | 2021-06-25 17:26:41 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-06-25 20:52:08 +0200 |
| commit | b29a43b4d71916ca6155be4d4d82ea137ff1a992 (patch) | |
| tree | 72b89456ca97484d0f440c58bf79d5d0c8e08422 /src/output/plugins/wasapi | |
| parent | f60a42e0b6326cd25f0c20eb21e03f4cc2d90bf0 (diff) | |
decoder/mad, ...: more libfmt logging
Diffstat (limited to 'src/output/plugins/wasapi')
| -rw-r--r-- | src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx index 367f84ce7..9b315fc1c 100644 --- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx +++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx @@ -26,6 +26,7 @@ #include "PropertyStore.hxx" #include "output/OutputAPI.hxx" #include "lib/icu/Win32.hxx" +#include "lib/fmt/AudioFormatFormatter.hxx" #include "mixer/MixerList.hxx" #include "output/Error.hxx" #include "pcm/Export.hxx" @@ -824,13 +825,12 @@ WasapiOutput::TryFormatExclusive(const AudioFormat &audio_format) HRESULT result = client->IsFormatSupported( AUDCLNT_SHAREMODE_EXCLUSIVE, reinterpret_cast<WAVEFORMATEX *>(&test_format), nullptr); - const auto format_string = ToString(audio_format); const auto result_string = std::string(HRESULTToString(result)); - FormatDebug(wasapi_output_domain, "Trying %s %lu %u-%u (exclusive) -> %s", - format_string.c_str(), test_format.Format.nSamplesPerSec, - test_format.Format.wBitsPerSample, - test_format.Samples.wValidBitsPerSample, - result_string.c_str()); + FmtDebug(wasapi_output_domain, "Trying {} {} {}-{} (exclusive) -> {}", + audio_format, test_format.Format.nSamplesPerSec, + test_format.Format.wBitsPerSample, + test_format.Samples.wValidBitsPerSample, + result_string); if (SUCCEEDED(result)) { device_format = test_format; return true; @@ -922,13 +922,12 @@ WasapiOutput::FindSharedFormatSupported(AudioFormat &audio_format) reinterpret_cast<WAVEFORMATEX *>(&device_format), closest_format.AddressCast<WAVEFORMATEX>()); { - const auto format_string = ToString(audio_format); const auto result_string = std::string(HRESULTToString(result)); - FormatDebug(wasapi_output_domain, "Trying %s %lu %u-%u (shared) -> %s", - format_string.c_str(), device_format.Format.nSamplesPerSec, - device_format.Format.wBitsPerSample, - device_format.Samples.wValidBitsPerSample, - result_string.c_str()); + FmtDebug(wasapi_output_domain, "Trying {} {} {}-{} (shared) -> {}", + audio_format, device_format.Format.nSamplesPerSec, + device_format.Format.wBitsPerSample, + device_format.Samples.wValidBitsPerSample, + result_string); } if (FAILED(result) && result != AUDCLNT_E_UNSUPPORTED_FORMAT) { @@ -950,15 +949,14 @@ WasapiOutput::FindSharedFormatSupported(AudioFormat &audio_format) reinterpret_cast<WAVEFORMATEX *>(&device_format), closest_format.AddressCast<WAVEFORMATEX>()); { - const auto format_string = ToString(audio_format); const auto result_string = std::string(HRESULTToString(result)); - FormatDebug(wasapi_output_domain, - "Trying %s %lu %u-%u (shared) -> %s", - format_string.c_str(), - device_format.Format.nSamplesPerSec, - device_format.Format.wBitsPerSample, - device_format.Samples.wValidBitsPerSample, - result_string.c_str()); + FmtDebug(wasapi_output_domain, + "Trying {} {} {}-{} (shared) -> {}", + audio_format, + device_format.Format.nSamplesPerSec, + device_format.Format.wBitsPerSample, + device_format.Samples.wValidBitsPerSample, + result_string); } if (FAILED(result)) { throw MakeHResultError(result, "Format is not supported"); |