diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2017-07-07 11:49:55 +0200 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@qt.io> | 2017-07-07 11:50:12 +0200 |
| commit | 1b10f8774cd118ec5a5c9e16d2ab4999a4daa9f6 (patch) | |
| tree | 10037115ddca1456026d7a1369c8728d376d0923 /src/multimedia/audio | |
| parent | 0b0c0e72d62972a0205d20afbb75147576c342d1 (diff) | |
| parent | eed32d94de9faca7380f7497e7ab0d119ef3cf5c (diff) | |
| download | qtmultimedia-1b10f8774cd118ec5a5c9e16d2ab4999a4daa9f6.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ifda1f02b8458a4fbe85d8bc27e61d4646147d82c
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qaudiobuffer.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp index e4918edf2..fe07d1e47 100644 --- a/src/multimedia/audio/qaudiobuffer.cpp +++ b/src/multimedia/audio/qaudiobuffer.cpp @@ -355,7 +355,7 @@ int QAudioBuffer::byteCount() const /*! Returns the duration of audio in this buffer, in microseconds. - This depends on the /l format(), and the \l frameCount(). + This depends on the \l format(), and the \l frameCount(). */ qint64 QAudioBuffer::duration() const { diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 3a3806155..1e9204598 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -181,7 +181,7 @@ private Q_SLOTS: if (m_context == 0) { qWarning("PulseAudioService: Unable to create new pulseaudio context"); - pa_threaded_mainloop_unlock(m_mainLoop); + unlock(); pa_threaded_mainloop_free(m_mainLoop); m_mainLoop = 0; onContextFailed(); @@ -193,7 +193,7 @@ private Q_SLOTS: if (pa_context_connect(m_context, 0, (pa_context_flags_t)0, 0) < 0) { qWarning("PulseAudioService: pa_context_connect() failed"); pa_context_unref(m_context); - pa_threaded_mainloop_unlock(m_mainLoop); + unlock(); pa_threaded_mainloop_free(m_mainLoop); m_mainLoop = 0; m_context = 0; |