Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ic9ca37f9f5d047cb3addeece5bab7b71ae78ce19

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;
     }