diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-04-21 15:11:49 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-04-27 10:56:34 +0000 |
| commit | 97be9eb9b13c65f0ef6a6bf4f043fc865365089f (patch) | |
| tree | 95b9cc527d9a7762ffc6c3c0db3f999f059cb03f /src/multimedia/playback | |
| parent | 311ae5866c8385fb18cb40e3fe733995f8fe9653 (diff) | |
| download | qtmultimedia-97be9eb9b13c65f0ef6a6bf4f043fc865365089f.tar.gz | |
Add missing implementation for QMediaPlaylist::moveMedia().
QMediaNetworkPlaylistProvider, which is the default playlist provider,
didn't have an implementation for that new function added in 5.7.
Change-Id: I1ec8cdd60a1429addd47d0b37131f724e8d4b748
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index a2c448da1..67ce123d8 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -206,10 +206,16 @@ bool QMediaNetworkPlaylistProvider::insertMedia(int pos, const QList<QMediaConte bool QMediaNetworkPlaylistProvider::moveMedia(int from, int to) { - Q_UNUSED(from); - Q_UNUSED(to); + Q_D(QMediaNetworkPlaylistProvider); - return true; + Q_ASSERT(from >= 0 && from < mediaCount()); + Q_ASSERT(to >= 0 && to < mediaCount()); + + if (from == to) + return false; + + const QMediaContent media = d->resources.at(from); + return removeMedia(from, from) && insertMedia(to, media); } bool QMediaNetworkPlaylistProvider::removeMedia(int fromPos, int toPos) |