summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2024-05-06 12:28:11 +0800
committerTim Blechmann <tim@klingt.org>2024-05-08 12:55:13 +0800
commitd41aa5d6a70a51a4982a090cd6e58a69aa4651e9 (patch)
tree65a643e00a1c643528c985e5fdecc2d0a4f5de81
parentdc60c98f9ea4213801a20fc97f5780c48ac86bf1 (diff)
GStreamer: audio io - warn to default logging output
GStreamer audio io warnings were sent to specific logging categories. When the device cannot be created, it would arguably justify a more prominent output. Pick-to: 6.5 6.7 Change-Id: I0ec518172cbaee849a058d5af9946719ae1a5317 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp9
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp11
2 files changed, 11 insertions, 9 deletions
diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp
index 59d40097e..ca56c4572 100644
--- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp
+++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp
@@ -75,25 +75,26 @@ void QGstreamerAudioInput::setAudioDevice(const QAudioDevice &device)
if (newSrc)
newSrc.set("device", id.constData());
else
- qCWarning(qLcMediaAudioInput) << "Cannot create pulsesrc";
+ qWarning() << "Cannot create pulsesrc";
} else if constexpr (QT_CONFIG(alsa)) {
newSrc = QGstElement::createFromFactory("alsasrc", "audiosrc");
if (newSrc)
newSrc.set("device", id.constData());
else
- qCWarning(qLcMediaAudioInput) << "Cannot create alsasrc";
+ qWarning() << "Cannot create alsasrc";
} else {
auto *gstDeviceInfo =
dynamic_cast<const QGStreamerAudioDeviceInfo *>(m_audioDevice.handle());
if (gstDeviceInfo && gstDeviceInfo->gstDevice) {
newSrc = QGstElement::createFromDevice(gstDeviceInfo->gstDevice, "audiosrc");
} else {
- qCWarning(qLcMediaAudioInput) << "Invalid audio device";
+ qWarning() << "Invalid audio device";
}
}
if (newSrc.isNull()) {
- qCWarning(qLcMediaAudioInput) << "Failed to create a gst element for the audio device, using a default audio source";
+ qWarning() << "Failed to create a gst element for the audio device, using a default audio "
+ "source";
newSrc = QGstElement::createFromFactory("autoaudiosrc", "audiosrc");
}
diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
index 2ad619fb2..6156c97be 100644
--- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
+++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
@@ -73,6 +73,7 @@ void QGstreamerAudioOutput::setAudioDevice(const QAudioDevice &info)
if (info == m_audioOutput)
return;
qCDebug(qLcMediaAudioOutput) << "setAudioOutput" << info.description() << info.isNull();
+
m_audioOutput = info;
const QByteArray &id = m_audioOutput.id();
@@ -82,24 +83,24 @@ void QGstreamerAudioOutput::setAudioDevice(const QAudioDevice &info)
if (newSink)
newSink.set("device", id.constData());
else
- qCWarning(qLcMediaAudioOutput) << "Cannot create pulsesink";
+ qWarning() << "Cannot create pulsesink";
} else if constexpr (QT_CONFIG(alsa)) {
newSink = QGstElement::createFromFactory("alsasink", "audiosink");
if (newSink)
newSink.set("device", id.constData());
else
- qCWarning(qLcMediaAudioOutput) << "Cannot create alsasink";
+ qWarning() << "Cannot create alsasink";
} else {
auto *deviceInfo = dynamic_cast<const QGStreamerAudioDeviceInfo *>(m_audioOutput.handle());
if (deviceInfo && deviceInfo->gstDevice)
newSink = QGstElement::createFromDevice(deviceInfo->gstDevice, "audiosink");
else
- qCWarning(qLcMediaAudioOutput) << "Invalid audio device";
+ qWarning() << "Invalid audio device";
}
if (newSink.isNull()) {
- qCWarning(qLcMediaAudioOutput) << "Failed to create a gst element for the audio "
- "device using a default audio sink";
+ qWarning() << "Failed to create a gst element for the audio "
+ "device using a default audio sink";
newSink = QGstElement::createFromFactory("autoaudiosink", "audiosink");
}