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

decoder/mad, ...: more libfmt logging

Browse Source
This commit is contained in:
Max Kellermann
2021-06-25 17:26:41 +02:00
parent f60a42e0b6
commit b29a43b4d7
42 changed files with 245 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/input/plugins/AlsaInputPlugin.cxx
View File

@@ -270,15 +270,15 @@ AlsaInputStream::Recover(int err)
{
switch(err) {
case -EPIPE:
FormatDebug(alsa_input_domain,
"Overrun on ALSA capture device \"%s\"",
device.c_str());
FmtDebug(alsa_input_domain,
"Overrun on ALSA capture device \"{}\"",
device);
break;
case -ESTRPIPE:
FormatDebug(alsa_input_domain,
"ALSA capture device \"%s\" was suspended",
device.c_str());
FmtDebug(alsa_input_domain,
"ALSA capture device \"{}\" was suspended",
device);
break;
}
@@ -361,9 +361,9 @@ AlsaInputStream::ConfigureCapture(AudioFormat audio_format)
unsigned buffer_time_min, buffer_time_max;
snd_pcm_hw_params_get_buffer_time_min(hw_params, &buffer_time_min, nullptr);
snd_pcm_hw_params_get_buffer_time_max(hw_params, &buffer_time_max, nullptr);
FormatDebug(alsa_input_domain, "buffer: size=%u..%u time=%u..%u",
(unsigned)buffer_size_min, (unsigned)buffer_size_max,
buffer_time_min, buffer_time_max);
FmtDebug(alsa_input_domain, "buffer: size={}..{} time={}..{}",
buffer_size_min, buffer_size_max,
buffer_time_min, buffer_time_max);
snd_pcm_uframes_t period_size_min, period_size_max;
snd_pcm_hw_params_get_period_size_min(hw_params, &period_size_min, nullptr);
@@ -371,9 +371,9 @@ AlsaInputStream::ConfigureCapture(AudioFormat audio_format)
unsigned period_time_min, period_time_max;
snd_pcm_hw_params_get_period_time_min(hw_params, &period_time_min, nullptr);
snd_pcm_hw_params_get_period_time_max(hw_params, &period_time_max, nullptr);
FormatDebug(alsa_input_domain, "period: size=%u..%u time=%u..%u",
(unsigned)period_size_min, (unsigned)period_size_max,
period_time_min, period_time_max);
FmtDebug(alsa_input_domain, "period: size={}..{} time={}..{}",
period_size_min, period_size_max,
period_time_min, period_time_max);
/* choose the maximum possible buffer_size ... */
snd_pcm_hw_params_set_buffer_size(capture_handle, hw_params,
@@ -409,8 +409,8 @@ AlsaInputStream::ConfigureCapture(AudioFormat audio_format)
throw FormatRuntimeError("snd_pcm_hw_params_get_period_size() failed: %s",
snd_strerror(-err));
FormatDebug(alsa_input_domain, "buffer_size=%u period_size=%u",
(unsigned)alsa_buffer_size, (unsigned)alsa_period_size);
FmtDebug(alsa_input_domain, "buffer_size={} period_size={}",
alsa_buffer_size, alsa_period_size);
snd_pcm_sw_params_t *sw_params;
snd_pcm_sw_params_alloca(&sw_params);

11
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -281,10 +281,7 @@ CurlInputStream::OnHeaders(unsigned status,
if (i != headers.end()) {
size_t icy_metaint = ParseUint64(i->second.c_str());
#ifndef _WIN32
/* Windows doesn't know "%z" */
FormatDebug(curl_domain, "icy-metaint=%zu", icy_metaint);
#endif
FmtDebug(curl_domain, "icy-metaint={}", icy_metaint);
if (icy_metaint > 0) {
icy->Start(icy_metaint);
@@ -358,10 +355,10 @@ input_curl_init(EventLoop &event_loop, const ConfigBlock &block)
const auto version_info = curl_version_info(CURLVERSION_FIRST);
if (version_info != nullptr) {
FormatDebug(curl_domain, "version %s", version_info->version);
FmtDebug(curl_domain, "version {}", version_info->version);
if (version_info->features & CURL_VERSION_SSL)
FormatDebug(curl_domain, "with %s",
version_info->ssl_version);
FmtDebug(curl_domain, "with {}",
version_info->ssl_version);
}
http_200_aliases = curl_slist_append(http_200_aliases, "ICY 200 OK");

3
src/input/plugins/TidalInputPlugin.cxx
View File

@@ -183,7 +183,8 @@ InitTidalInput(EventLoop &event_loop, const ConfigBlock &block)
if (password == nullptr)
throw PluginUnconfigured("No Tidal password configured");
FormatWarning(tidal_domain, "The Tidal input plugin is deprecated because Tidal has changed the protocol and doesn't share documentation");
LogWarning(tidal_domain,
"The Tidal input plugin is deprecated because Tidal has changed the protocol and doesn't share documentation");
tidal_audioquality = block.GetBlockValue("audioquality", "HIGH");

2
src/input/plugins/TidalSessionManager.cxx
View File

@@ -81,7 +81,7 @@ TidalSessionManager::AddLoginHandler(TidalSessionHandler &h) noexcept
void
TidalSessionManager::OnTidalLoginSuccess(std::string _session) noexcept
{
FormatDebug(tidal_domain, "Login successful, session=%s", _session.c_str());
FmtDebug(tidal_domain, "Login successful, session={}", _session);
{
const std::lock_guard<Mutex> protect(mutex);