diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:55 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:55 +0300 |
| commit | 981ed7e4ecfcc27cbe9c0492b31f89386335155c (patch) | |
| tree | 09787eb1f15bd85db2b4a10e031bbe2e3fffd0f1 | |
| parent | 34420b12f697484b1cd59e5091a0cc4c7d90e2bc (diff) | |
| parent | e760a6aae78f6a41ec0430c9e242b449a3a217a8 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: I725962188e023f6a05333eca71cd14aa48ab7506
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qnx-audio/audio/audio.pro | 1 |
3 files changed, 5 insertions, 2 deletions
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 diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 51cdde026..a141f7e36 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(); } 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) |