diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-14 20:28:08 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-20 15:10:19 +0000 |
commit | 33c3b6cec04e2c2629af14e2ead4f7761e7d0a4e (patch) | |
tree | 5f752a439a6c9a302b83323be4d1affc81e581ce | |
parent | df8363ab6c54c3c2df42cfcec8550e48eddd4f20 (diff) |
Remove unused QMediaPlaylistSourceControl
Change-Id: Ib047c62933364cb3bbcc3d659d9ab235a1097279
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
6 files changed, 0 insertions, 285 deletions
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index d75d0b5c4..37e13398b 100644 --- a/src/multimedia/controls/controls.pri +++ b/src/multimedia/controls/controls.pri @@ -36,7 +36,6 @@ PUBLIC_HEADERS += \ PRIVATE_HEADERS += \ controls/qmediaplaylistcontrol_p.h \ - controls/qmediaplaylistsourcecontrol_p.h SOURCES += \ controls/qcameracapturebufferformatcontrol.cpp \ @@ -55,7 +54,6 @@ SOURCES += \ controls/qmediacontainercontrol.cpp \ controls/qmediaplayercontrol.cpp \ controls/qmediaplaylistcontrol.cpp \ - controls/qmediaplaylistsourcecontrol.cpp \ controls/qmediarecordercontrol.cpp \ controls/qmediastreamscontrol.cpp \ controls/qmetadatareadercontrol.cpp \ diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp deleted file mode 100644 index f95c4b508..000000000 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $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 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 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. -** -** 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$ -** -****************************************************************************/ - - -#include "qmediaplaylistsourcecontrol_p.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaPlaylistSourceControl - \internal - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMediaPlaylistSourceControl class provides access to the playlist playback - functionality of a QMediaService. - - This control allows QMediaPlaylist to be passed directly to the service - instead of playing media sources one by one. This control should be - implemented if backend benefits from knowing the next media source to be - played, for example for preloading, cross fading or gap-less playback. - - If QMediaPlaylistSourceControl is provided, the backend must listen for - current playlist item changes to load corresponding media source and - advance the playlist with QMediaPlaylist::next() when playback of the - current media is finished. - - The interface name of QMediaPlaylistSourceControl is \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 as - defined in QMediaPlaylistSourceControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QMediaPlaylistSourceControl_iid - - \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 - - Defines the interface name of the QMediaPlaylistSourceControl class. - - \relates QMediaPlaylistSourceControl -*/ - -/*! - Create a new playlist source control object with the given \a parent. -*/ -QMediaPlaylistSourceControl::QMediaPlaylistSourceControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the playlist control. -*/ -QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() -{ -} - - -/*! - \fn QMediaPlaylistSourceControl::playlist() const - - Returns the current playlist. - Should return a null pointer if no playlist is assigned. -*/ - -/*! - \fn QMediaPlaylistSourceControl::setPlaylist(QMediaPlaylist *playlist) - - Set the playlist of this media player to \a playlist. - If a null pointer is passed, the playlist source should be disabled. - - The current media should be replaced with the current item of the media playlist. -*/ - - -/*! - \fn QMediaPlaylistSourceControl::playlistChanged(QMediaPlaylist* playlist) - - Signal emitted when the playlist has changed to \a playlist. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaplaylistsourcecontrol_p.cpp" diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h deleted file mode 100644 index a98ee8738..000000000 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $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 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 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. -** -** 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$ -** -****************************************************************************/ - - -#ifndef QMEDIAPLAYLISTSOURCECONTROL_P_H -#define QMEDIAPLAYLISTSOURCECONTROL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qmediacontrol.h> - -QT_BEGIN_NAMESPACE - - -class QMediaPlaylist; - -class Q_MULTIMEDIA_EXPORT QMediaPlaylistSourceControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QMediaPlaylistSourceControl(); - - virtual QMediaPlaylist *playlist() const = 0; - virtual void setPlaylist(QMediaPlaylist *) = 0; - -Q_SIGNALS: - void playlistChanged(QMediaPlaylist* playlist); - -protected: - QMediaPlaylistSourceControl(QObject *parent = nullptr); -}; - -#define QMediaPlaylistSourceControl_iid "org.qt-project.qt.mediaplaylistsourcecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAPLAYLISTCONTROL_P_H diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 977c02e69..850ed69b9 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -47,7 +47,6 @@ #include <qmediaserviceprovider_p.h> #include <qmediaplaylist.h> #include <qmediaplaylistcontrol_p.h> -#include <qmediaplaylistsourcecontrol_p.h> #include <qaudiorolecontrol.h> #include <qcustomaudiorolecontrol.h> diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index e843374fb..e33c97140 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -31,7 +31,6 @@ #include "qmediaservice.h" #include "qmediaplaylist.h" #include <private/qmediaplaylistcontrol_p.h> -#include <private/qmediaplaylistsourcecontrol_p.h> #include <private/qmediaplaylistnavigator_p.h> #include <private/qmediapluginloader_p.h> @@ -91,7 +90,6 @@ private slots: void mediaPlayListProvider(); // TC for Abstract control classes void mediaPlayListControl(); - void mediaPlayListSourceControl(); private: @@ -1220,14 +1218,6 @@ void tst_QMediaPlaylist::mediaPlayListControl() MockMediaPlaylistControl plylistctrl(false, &parent); } -// MaemoAPI-1850:test QMediaPlayListSourceControl constructor -void tst_QMediaPlaylist::mediaPlayListSourceControl() -{ - // To check changes in abstract classe's pure virtual functions - QObject parent; - MockPlaylistSourceControl plylistsrcctrl(&parent); -} - // MaemoAPI-1852:test constructor void tst_QMediaPlaylist::mediaPlayListProvider() { diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h deleted file mode 100644 index fb30e3c79..000000000 --- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOCKMEDIAPLAYLISTSOURCECONTROL_H -#define MOCKMEDIAPLAYLISTSOURCECONTROL_H - -#include <private/qmediaplaylistsourcecontrol_p.h> - -class MockPlaylistSourceControl : public QMediaPlaylistSourceControl -{ - Q_OBJECT -public: - MockPlaylistSourceControl(QObject *parent) - : QMediaPlaylistSourceControl(parent), - m_playlist(0) - { - } - - ~MockPlaylistSourceControl() - { - } - - void setPlaylist(QMediaPlaylist *playlist) - { - m_playlist = playlist; - } - - QMediaPlaylist *playlist() const - { - return m_playlist; - } -private: - QMediaPlaylist *m_playlist; -}; - -#endif // MOCKMEDIAPLAYLISTSOURCECONTROL_H |