[SCM] qtmultimedia packaging branch, ubuntu, updated. ubuntu/5.6.1-2ubuntu1-5-g0d6fd99

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=0d6fd99

The following commit has been merged in the ubuntu branch:
commit 0d6fd99a8875fec364d5d92c564e526c176054fd
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 21 11:37:38 2016 +0000

    debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
    
    * debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
      - Fix load() (LP: #1510225)
---
 debian/changelog                                   |  7 ++++
 .../Optimize-QMediaPlaylistPrivate-readItems.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e3bdf05..5470b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtmultimedia-opensource-src (5.6.1-2ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
+    - Fix load() (LP: #1510225)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 21 Sep 2016 11:36:56 +0000
+
 qtmultimedia-opensource-src (5.6.1-2ubuntu1~1) yakkety; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch b/debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
new file mode 100644
index 0000000..5acedc5
--- /dev/null
+++ b/debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
@@ -0,0 +1,38 @@
+From 6817067ff72c4493ab39fd065c9382568da06378 Mon Sep 17 00:00:00 2001
+From: Yoann Lopes <yoann.lopes at qt.io>
+Date: Thu, 18 Aug 2016 14:18:59 +0200
+Subject: [PATCH] Optimize QMediaPlaylistPrivate::readItems()
+
+When reading playlist items from a file, pass them to the playlist
+backend all at once rather than one by one. This might be faster
+depending on the implementation.
+
+Task-number: QTBUG-54849
+Change-Id: I57acdc68604ee56fe5d7615ba0a72655e668443f
+Reviewed-by: Christian Stromme <christian.stromme at qt.io>
+---
+ src/multimedia/playback/qmediaplaylist.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
+index c633406..7246d2a 100644
+--- a/src/multimedia/playback/qmediaplaylist.cpp
++++ b/src/multimedia/playback/qmediaplaylist.cpp
+@@ -428,10 +428,12 @@ bool QMediaPlaylist::clear()
+ 
+ bool QMediaPlaylistPrivate::readItems(QMediaPlaylistReader *reader)
+ {
++    QList<QMediaContent> items;
++
+     while (!reader->atEnd())
+-        playlist()->addMedia(reader->readItem());
++        items.append(reader->readItem());
+ 
+-    return true;
++    return playlist()->addMedia(items);
+ }
+ 
+ bool QMediaPlaylistPrivate::writeItems(QMediaPlaylistWriter *writer)
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 8aa347c..d831094 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ skip_failing_tests.patch
 Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
 Added-insertItems-and-removeItems-to-QML-Playlist.patch
 Add-moveItem-from-to-to-QMediaPlaylist.patch
+Optimize-QMediaPlaylistPrivate-readItems.patch

-- 
qtmultimedia packaging