diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:41 +0100 |
| commit | 37a3f367bb9cf4459e681364bf9b31e79c8846d4 (patch) | |
| tree | 6425f31ac0f3d51d65407168d400762167e4db58 | |
| parent | 639852cfc8f4aad5587ab080b68b1ef4f4a6c89c (diff) | |
| parent | 126d16b0f81f5fae2de5469d9f233d9b79d08d61 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7e2638b36d355697f688fe214c0743959e14362a
| -rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qnx-audio/audio/qnxaudioinput.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qnx-audio/audio/qnxaudiooutput.cpp | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp index b146fb7b3..8089a9320 100644 --- a/src/multimedia/playback/qmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qmediaplaylistprovider.cpp @@ -246,7 +246,7 @@ bool QMediaPlaylistProvider::removeMedia(int position) */ bool QMediaPlaylistProvider::removeMedia(int start, int end) { - for (int pos=start; pos<=end; pos++) { + for (int pos=end; pos>=start; pos--) { if (!removeMedia(pos)) return false; } diff --git a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp index b16328892..70b83390c 100644 --- a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp +++ b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp @@ -339,7 +339,11 @@ bool QnxAudioInput::open() void QnxAudioInput::close() { if (m_pcmHandle) +#if SND_PCM_VERSION < SND_PROTOCOL_VERSION('P',3,0,2) snd_pcm_plugin_flush(m_pcmHandle, SND_PCM_CHANNEL_CAPTURE); +#else + snd_pcm_plugin_drop(m_pcmHandle, SND_PCM_CHANNEL_CAPTURE); +#endif if (m_pcmNotifier) { delete m_pcmNotifier; diff --git a/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp b/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp index c4c09f543..34ea23604 100644 --- a/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp +++ b/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp @@ -123,7 +123,11 @@ void QnxAudioOutput::stop() void QnxAudioOutput::reset() { if (m_pcmHandle) +#if SND_PCM_VERSION < SND_PROTOCOL_VERSION('P',3,0,2) snd_pcm_playback_drain(m_pcmHandle); +#else + snd_pcm_channel_drain(m_pcmHandle, SND_PCM_CHANNEL_PLAYBACK); +#endif stop(); } @@ -360,7 +364,11 @@ void QnxAudioOutput::close() destroyPcmNotifiers(); if (m_pcmHandle) { +#if SND_PCM_VERSION < SND_PROTOCOL_VERSION('P',3,0,2) snd_pcm_plugin_flush(m_pcmHandle, SND_PCM_CHANNEL_PLAYBACK); +#else + snd_pcm_plugin_drop(m_pcmHandle, SND_PCM_CHANNEL_PLAYBACK); +#endif snd_pcm_close(m_pcmHandle); m_pcmHandle = 0; } |