From 226f802fb04de6b135a0214674ce77643ba479c4 Mon Sep 17 00:00:00 2001 From: Roland Rossgotterer Date: Sat, 23 Mar 2019 13:25:54 +0100 Subject: Add source url to 'decoding error' warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, QSoundEffect logged a warning if the source could not be decoded, but without mentioning the source it tried to decode. When using multiple QSoundEffects in one application, adding the source to the warning will help to find the one causing the decode error. Change-Id: I4c6bbdfe4a62f650b64ab951bcc637febedae98e Reviewed-by: VaL Doroshchuk Reviewed-by: André Hartmann --- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 2 +- src/multimedia/audio/qsoundeffect_qaudio_p.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index bbaf405b6..4a2e30185 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -744,7 +744,7 @@ void QSoundEffectPrivate::sampleReady() void QSoundEffectPrivate::decoderError() { - qWarning("QSoundEffect(pulseaudio): Error decoding source"); + qWarning("QSoundEffect(pulseaudio): Error decoding source %ls", qUtf16Printable(m_source.toString())); disconnect(m_sample, &QSample::error, this, &QSoundEffectPrivate::decoderError); bool playingDirty = false; if (m_playing) { diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp index d7a19eeec..13df416f3 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -344,7 +344,7 @@ void PrivateSoundSource::sampleReady() void PrivateSoundSource::decoderError() { - qWarning("QSoundEffect(qaudio): Error decoding source"); + qWarning("QSoundEffect(qaudio): Error decoding source %ls", qUtf16Printable(m_url.toString())); disconnect(m_sample, &QSample::ready, this, &PrivateSoundSource::sampleReady); disconnect(m_sample, &QSample::error, this, &PrivateSoundSource::decoderError); m_playing = false; -- cgit v1.2.1