summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:29:51 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:29:51 +0100
commitb07a7d79f3080892d381c40ec79679450bda5431 (patch)
tree316f69a3e3e557602f195e41284fb35bf264c8b6 /src/multimedia
parent1057d6a89ab4c19825ab2d5d12aed31496b89423 (diff)
parentc296df781d9fa445bb4b1fcbb6f340e0d1db0c3a (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .qmake.conf Change-Id: Ie0a7534d518cd5758119edc77d8275ac3da2037c
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qsoundeffect_pulse_p.cpp2
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.cpp2
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 075e639a8..0855c1f67 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -750,7 +750,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 ac4dd9cf9..b553671fa 100644
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
@@ -354,7 +354,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;