diff options
Diffstat (limited to 'src/multimedia/playback/qmediaplaylist.cpp')
-rw-r--r-- | src/multimedia/playback/qmediaplaylist.cpp | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 7246d2adc..97fe75044 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -386,6 +392,20 @@ bool QMediaPlaylist::insertMedia(int pos, const QList<QMediaContent> &items) } /*! + Move the item from position \a from to position \a to. + + Returns true if the operation is successful, otherwise false. + + \since 5.7 +*/ +bool QMediaPlaylist::moveMedia(int from, int to) +{ + QMediaPlaylistProvider *playlist = d_func()->playlist(); + return playlist->moveMedia(qBound(0, from, playlist->mediaCount()), + qBound(0, to, playlist->mediaCount())); +} + +/*! Remove the item from the playlist at position \a pos. Returns true if the operation is successful, otherwise return false. @@ -519,7 +539,8 @@ void QMediaPlaylist::load(const QNetworkRequest &request, const char *format) return; } - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canRead(request.url(), format)) { QMediaPlaylistReader *reader = plugin->createReader(request.url(), QByteArray(format)); @@ -580,7 +601,8 @@ void QMediaPlaylist::load(QIODevice * device, const char *format) return; } - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canRead(device,format)) { QMediaPlaylistReader *reader = plugin->createReader(device,QByteArray(format)); @@ -642,7 +664,8 @@ bool QMediaPlaylist::save(QIODevice * device, const char *format) if (d->playlist()->save(device,format)) return true; - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canWrite(device,format)) { QMediaPlaylistWriter *writer = plugin->createWriter(device,QByteArray(format)); |