From 40effbba008394b77a472442389ae1d495b19738 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 7 Sep 2021 17:09:13 +0300 Subject: Bump version Change-Id: I127b22ada9ce43fb384a6e6b18dbc458f4ccd434 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d7055d75c..6d03a03fe 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.6 +MODULE_VERSION = 5.15.7 -- cgit v1.2.3 From d23fcd68bc3c514fbda822605c3aa6cbda1c043c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Sep 2021 09:16:04 +0200 Subject: Fix incorrectly generated CMake files for the QNX audio plugin The .pro file for the QNX audio plugin did not set PLUGIN_CLASS_NAME, which led to incorrectly generated CMake files. Fixes: QTBUG-93747 Change-Id: Id91550959c935195262c3babbd8433ab151eac95 Reviewed-by: Teemu Holappa --- src/plugins/qnx-audio/audio/audio.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro index bd69dfe1e..d63e58676 100644 --- a/src/plugins/qnx-audio/audio/audio.pro +++ b/src/plugins/qnx-audio/audio/audio.pro @@ -19,4 +19,5 @@ SOURCES += qnxaudioplugin.cpp \ OTHER_FILES += qnx_audio.json PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QnxAudioPlugin load(qt_plugin) -- cgit v1.2.3 From e760a6aae78f6a41ec0430c9e242b449a3a217a8 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Sat, 31 Jul 2021 06:05:57 +0200 Subject: PulseAudio: Call pa_stream_flush() with PulseDaemonLocker lock held The pa_stream_flush() must be called with pa_threaded_mainloop_lock() held, otherwise it is possible to corrupt internal PA state. The PulseDaemonLocker implements this lock and other pa_stream_flush() instances within qsoundeffect_pulse_p.cpp already instantiate the PulseDaemonLocker to claim the pa_threaded_mainloop_lock(). Add the missing locking to ::setVolume pa_stream_flush() call too. Change-Id: I667b1df669f839737c6cedb62ff66b612bdd65a0 Reviewed-by: Lars Knoll --- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 5c15d4a6a..04c33a93e 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -552,8 +552,10 @@ void QSoundEffectPrivate::setVolume(qreal volume) m_volume = qBound(qreal(0), volume, qreal(1)); locker.unlock(); - if (!m_playing && m_pulseStream) + if (!m_playing && m_pulseStream) { + PulseDaemonLocker locker; pa_stream_flush(m_pulseStream, volume_stream_flush_callback, m_ref->getRef()); + } emit volumeChanged(); } -- cgit v1.2.3