Move most of playlist API to private.
Moved objects either not needed to be public or require API review/redesign. Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
cb39035162
commit
10b0063401
@@ -20,8 +20,6 @@ PUBLIC_HEADERS += \
|
|||||||
controls/qmediagaplessplaybackcontrol.h \
|
controls/qmediagaplessplaybackcontrol.h \
|
||||||
controls/qmedianetworkaccesscontrol.h \
|
controls/qmedianetworkaccesscontrol.h \
|
||||||
controls/qmediaplayercontrol.h \
|
controls/qmediaplayercontrol.h \
|
||||||
controls/qmediaplaylistcontrol.h \
|
|
||||||
controls/qmediaplaylistsourcecontrol.h \
|
|
||||||
controls/qmediarecordercontrol.h \
|
controls/qmediarecordercontrol.h \
|
||||||
controls/qmediastreamscontrol.h \
|
controls/qmediastreamscontrol.h \
|
||||||
controls/qmetadatareadercontrol.h \
|
controls/qmetadatareadercontrol.h \
|
||||||
@@ -36,7 +34,9 @@ PUBLIC_HEADERS += \
|
|||||||
controls/qmediaavailabilitycontrol.h
|
controls/qmediaavailabilitycontrol.h
|
||||||
|
|
||||||
PRIVATE_HEADERS += \
|
PRIVATE_HEADERS += \
|
||||||
controls/qaudiodecodercontrol_p.h
|
controls/qaudiodecodercontrol_p.h \
|
||||||
|
controls/qmediaplaylistcontrol_p.h \
|
||||||
|
controls/qmediaplaylistsourcecontrol_p.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
controls/qaudioencodercontrol.cpp \
|
controls/qaudioencodercontrol.cpp \
|
||||||
|
|||||||
@@ -40,13 +40,15 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#include "qmediaplaylistcontrol.h"
|
#include "qmediaplaylistcontrol_p.h"
|
||||||
#include "qmediacontrol_p.h"
|
#include "qmediacontrol_p.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QMediaPlaylistControl
|
\class QMediaPlaylistControl
|
||||||
|
\internal
|
||||||
|
|
||||||
\inmodule QtMultimedia
|
\inmodule QtMultimedia
|
||||||
|
|
||||||
\ingroup multimedia
|
\ingroup multimedia
|
||||||
@@ -201,6 +203,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl()
|
|||||||
Signal emitted when current media changes to \a content.
|
Signal emitted when current media changes to \a content.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "moc_qmediaplaylistcontrol.cpp"
|
#include "moc_qmediaplaylistcontrol_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -40,11 +40,23 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#ifndef QMEDIAPLAYLISTCONTROL_H
|
#ifndef QMEDIAPLAYLISTCONTROL_P_H
|
||||||
#define QMEDIAPLAYLISTCONTROL_H
|
#define QMEDIAPLAYLISTCONTROL_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 <QtCore/qobject.h>
|
||||||
#include "qmediacontrol.h"
|
#include "qmediacontrol.h"
|
||||||
#include "qmediaplaylistnavigator.h"
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
@@ -95,4 +107,4 @@ QT_END_NAMESPACE
|
|||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
|
|
||||||
#endif // QMEDIAPLAYLISTCONTROL_H
|
#endif // QMEDIAPLAYLISTCONTROL_P_H
|
||||||
@@ -40,13 +40,15 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#include "qmediaplaylistsourcecontrol.h"
|
#include "qmediaplaylistsourcecontrol_p.h"
|
||||||
#include "qmediacontrol_p.h"
|
#include "qmediacontrol_p.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QMediaPlaylistSourceControl
|
\class QMediaPlaylistSourceControl
|
||||||
|
\internal
|
||||||
|
|
||||||
\inmodule QtMultimedia
|
\inmodule QtMultimedia
|
||||||
|
|
||||||
\ingroup multimedia
|
\ingroup multimedia
|
||||||
@@ -121,6 +123,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl()
|
|||||||
Signal emitted when the playlist has changed to \a playlist.
|
Signal emitted when the playlist has changed to \a playlist.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "moc_qmediaplaylistsourcecontrol.cpp"
|
#include "moc_qmediaplaylistsourcecontrol_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -40,8 +40,19 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#ifndef QMEDIAPLAYLISTSOURCECONTROL_H
|
#ifndef QMEDIAPLAYLISTSOURCECONTROL_P_H
|
||||||
#define QMEDIAPLAYLISTSOURCECONTROL_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>
|
#include <qmediacontrol.h>
|
||||||
|
|
||||||
@@ -79,4 +90,4 @@ QT_END_NAMESPACE
|
|||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
|
|
||||||
#endif // QMEDIAPLAYLISTCONTROL_H
|
#endif // QMEDIAPLAYLISTCONTROL_P_H
|
||||||
@@ -2,18 +2,17 @@ INCLUDEPATH += playback
|
|||||||
|
|
||||||
PUBLIC_HEADERS += \
|
PUBLIC_HEADERS += \
|
||||||
playback/qaudioendpointselector.h \
|
playback/qaudioendpointselector.h \
|
||||||
playback/qlocalmediaplaylistprovider.h \
|
|
||||||
playback/qmediacontent.h \
|
playback/qmediacontent.h \
|
||||||
playback/qmediaplayer.h \
|
playback/qmediaplayer.h \
|
||||||
playback/qmediaplaylist.h \
|
playback/qmediaplaylist.h \
|
||||||
playback/qmediaplaylistioplugin.h \
|
|
||||||
playback/qmediaplaylistnavigator.h \
|
|
||||||
playback/qmediaplaylistprovider.h \
|
|
||||||
playback/qmediaresource.h
|
playback/qmediaresource.h
|
||||||
|
|
||||||
PRIVATE_HEADERS += \
|
PRIVATE_HEADERS += \
|
||||||
playback/qmediaplaylist_p.h \
|
playback/qmediaplaylist_p.h \
|
||||||
playback/qmediaplaylistprovider_p.h
|
playback/qmediaplaylistprovider_p.h \
|
||||||
|
playback/qmediaplaylistioplugin_p.h \
|
||||||
|
playback/qlocalmediaplaylistprovider_p.h \
|
||||||
|
playback/qmediaplaylistnavigator_p.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
playback/qaudioendpointselector.cpp \
|
playback/qaudioendpointselector.cpp \
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "qlocalmediaplaylistprovider.h"
|
#include "qlocalmediaplaylistprovider_p.h"
|
||||||
#include "qmediaplaylistprovider_p.h"
|
#include "qmediaplaylistprovider_p.h"
|
||||||
#include "qmediacontent.h"
|
#include "qmediacontent.h"
|
||||||
|
|
||||||
@@ -189,6 +189,6 @@ void QLocalMediaPlaylistProvider::shuffle()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qlocalmediaplaylistprovider.cpp"
|
#include "moc_qlocalmediaplaylistprovider_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -39,10 +39,21 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef QLOCALMEDIAPAYLISTPROVIDER_H
|
#ifndef QLOCALMEDIAPAYLISTPROVIDER_P_H
|
||||||
#define QLOCALMEDIAPAYLISTPROVIDER_H
|
#define QLOCALMEDIAPAYLISTPROVIDER_P_H
|
||||||
|
|
||||||
#include "qmediaplaylistprovider.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 "qmediaplaylistprovider_p.h"
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
|
|
||||||
@@ -84,4 +95,4 @@ QT_END_NAMESPACE
|
|||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
|
|
||||||
#endif // QLOCALMEDIAPAYLISTSOURCE_H
|
#endif // QLOCALMEDIAPAYLISTSOURCE_P_H
|
||||||
@@ -47,8 +47,8 @@
|
|||||||
#include <qmediaplayercontrol.h>
|
#include <qmediaplayercontrol.h>
|
||||||
#include <qmediaserviceprovider_p.h>
|
#include <qmediaserviceprovider_p.h>
|
||||||
#include <qmediaplaylist.h>
|
#include <qmediaplaylist.h>
|
||||||
#include <qmediaplaylistcontrol.h>
|
#include <qmediaplaylistcontrol_p.h>
|
||||||
#include <qmediaplaylistsourcecontrol.h>
|
#include <qmediaplaylistsourcecontrol_p.h>
|
||||||
|
|
||||||
#include <qmedianetworkaccesscontrol.h>
|
#include <qmedianetworkaccesscontrol.h>
|
||||||
|
|
||||||
|
|||||||
@@ -41,11 +41,11 @@
|
|||||||
|
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
#include "qmediaplaylist_p.h"
|
#include "qmediaplaylist_p.h"
|
||||||
#include "qmediaplaylistprovider.h"
|
#include "qmediaplaylistprovider_p.h"
|
||||||
#include "qlocalmediaplaylistprovider.h"
|
#include "qlocalmediaplaylistprovider_p.h"
|
||||||
#include "qmediaplaylistioplugin.h"
|
#include "qmediaplaylistioplugin_p.h"
|
||||||
#include "qmediaservice.h"
|
#include "qmediaservice.h"
|
||||||
#include "qmediaplaylistcontrol.h"
|
#include "qmediaplaylistcontrol_p.h"
|
||||||
#include "qmediaplayercontrol.h"
|
#include "qmediaplayercontrol.h"
|
||||||
|
|
||||||
#include <QtCore/qlist.h>
|
#include <QtCore/qlist.h>
|
||||||
|
|||||||
@@ -54,10 +54,10 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
#include "qmediaplaylistcontrol.h"
|
#include "qmediaplaylistcontrol_p.h"
|
||||||
#include "qmediaplayer.h"
|
#include "qmediaplayer.h"
|
||||||
#include "qmediaplayercontrol.h"
|
#include "qmediaplayercontrol.h"
|
||||||
#include "qlocalmediaplaylistprovider.h"
|
#include "qlocalmediaplaylistprovider_p.h"
|
||||||
#include "qmediaobject_p.h"
|
#include "qmediaobject_p.h"
|
||||||
|
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "qmediaplaylistioplugin.h"
|
#include "qmediaplaylistioplugin_p.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@@ -117,6 +117,8 @@ QMediaPlaylistWriter::~QMediaPlaylistWriter()
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QMediaPlaylistIOPlugin
|
\class QMediaPlaylistIOPlugin
|
||||||
|
\internal
|
||||||
|
|
||||||
\brief The QMediaPlaylistIOPlugin class provides an interface for media playlist I/O plug-ins.
|
\brief The QMediaPlaylistIOPlugin class provides an interface for media playlist I/O plug-ins.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -189,6 +191,6 @@ QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin()
|
|||||||
If the device is invalid or the format is unsupported this will return a null pointer.
|
If the device is invalid or the format is unsupported this will return a null pointer.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "moc_qmediaplaylistioplugin.cpp"
|
#include "moc_qmediaplaylistioplugin_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -39,8 +39,19 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef QMEDIAPLAYLISTIOPLUGIN_H
|
#ifndef QMEDIAPLAYLISTIOPLUGIN_P_H
|
||||||
#define QMEDIAPLAYLISTIOPLUGIN_H
|
#define QMEDIAPLAYLISTIOPLUGIN_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 <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
#include <QtCore/qplugin.h>
|
#include <QtCore/qplugin.h>
|
||||||
@@ -123,4 +134,4 @@ QT_END_NAMESPACE
|
|||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
|
|
||||||
#endif // QMEDIAPLAYLISTIOPLUGIN_H
|
#endif // QMEDIAPLAYLISTIOPLUGIN_P_H
|
||||||
@@ -39,8 +39,8 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "qmediaplaylistnavigator.h"
|
#include "qmediaplaylistnavigator_p.h"
|
||||||
#include "qmediaplaylistprovider.h"
|
#include "qmediaplaylistprovider_p.h"
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
#include "qmediaobject_p.h"
|
#include "qmediaobject_p.h"
|
||||||
|
|
||||||
@@ -542,6 +542,6 @@ void QMediaPlaylistNavigatorPrivate::_q_mediaChanged(int start, int end)
|
|||||||
Signals that media immediately surrounding the current position has changed.
|
Signals that media immediately surrounding the current position has changed.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "moc_qmediaplaylistnavigator.cpp"
|
#include "moc_qmediaplaylistnavigator_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -39,10 +39,21 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef QMEDIAPLAYLISTNAVIGATOR_H
|
#ifndef QMEDIAPLAYLISTNAVIGATOR_P_H
|
||||||
#define QMEDIAPLAYLISTNAVIGATOR_H
|
#define QMEDIAPLAYLISTNAVIGATOR_P_H
|
||||||
|
|
||||||
#include "qmediaplaylistprovider.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 "qmediaplaylistprovider_p.h"
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
|
|
||||||
@@ -112,4 +123,4 @@ QT_END_NAMESPACE
|
|||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
|
|
||||||
#endif // QMEDIAPLAYLISTNAVIGATOR_H
|
#endif // QMEDIAPLAYLISTNAVIGATOR_P_H
|
||||||
@@ -39,7 +39,6 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "qmediaplaylistprovider.h"
|
|
||||||
#include "qmediaplaylistprovider_p.h"
|
#include "qmediaplaylistprovider_p.h"
|
||||||
|
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
@@ -305,6 +304,6 @@ void QMediaPlaylistProvider::shuffle()
|
|||||||
Signals that a load failed() due to an \a error. The \a errorMessage provides more information.
|
Signals that a load failed() due to an \a error. The \a errorMessage provides more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "moc_qmediaplaylistprovider.cpp"
|
#include "moc_qmediaplaylistprovider_p.cpp"
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
|||||||
@@ -1,115 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/
|
|
||||||
**
|
|
||||||
** This file is part of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** This file may be used under the terms of the GNU Lesser General Public
|
|
||||||
** License version 2.1 as published by the Free Software Foundation and
|
|
||||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
||||||
** file. Please review the following information to ensure the GNU Lesser
|
|
||||||
** General Public License version 2.1 requirements will be met:
|
|
||||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Nokia gives you certain additional
|
|
||||||
** rights. These rights are described in the Nokia Qt 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 3.0 as published by the Free Software Foundation
|
|
||||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
||||||
** file. Please review the following information to ensure the GNU General
|
|
||||||
** Public License version 3.0 requirements will be met:
|
|
||||||
** http://www.gnu.org/copyleft/gpl.html.
|
|
||||||
**
|
|
||||||
** Other Usage
|
|
||||||
** Alternatively, this file may be used in accordance with the terms and
|
|
||||||
** conditions contained in a signed written agreement between you and Nokia.
|
|
||||||
**
|
|
||||||
**
|
|
||||||
**
|
|
||||||
**
|
|
||||||
**
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef QMEDIAPLAYLISTPROVIDER_H
|
|
||||||
#define QMEDIAPLAYLISTPROVIDER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
|
|
||||||
#include "qmediacontent.h"
|
|
||||||
#include "qmediaplaylist.h"
|
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
|
|
||||||
QT_MODULE(Multimedia)
|
|
||||||
|
|
||||||
class QString;
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
|
|
||||||
class QMediaPlaylistProviderPrivate;
|
|
||||||
class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
QMediaPlaylistProvider(QObject *parent=0);
|
|
||||||
virtual ~QMediaPlaylistProvider();
|
|
||||||
|
|
||||||
virtual bool load(const QUrl &location, const char *format = 0);
|
|
||||||
virtual bool load(QIODevice * device, const char *format = 0);
|
|
||||||
virtual bool save(const QUrl &location, const char *format = 0);
|
|
||||||
virtual bool save(QIODevice * device, const char *format);
|
|
||||||
|
|
||||||
virtual int mediaCount() const = 0;
|
|
||||||
virtual QMediaContent media(int index) const = 0;
|
|
||||||
|
|
||||||
virtual bool isReadOnly() const;
|
|
||||||
|
|
||||||
virtual bool addMedia(const QMediaContent &content);
|
|
||||||
virtual bool addMedia(const QList<QMediaContent> &contentList);
|
|
||||||
virtual bool insertMedia(int index, const QMediaContent &content);
|
|
||||||
virtual bool insertMedia(int index, const QList<QMediaContent> &content);
|
|
||||||
virtual bool removeMedia(int pos);
|
|
||||||
virtual bool removeMedia(int start, int end);
|
|
||||||
virtual bool clear();
|
|
||||||
|
|
||||||
public Q_SLOTS:
|
|
||||||
virtual void shuffle();
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void mediaAboutToBeInserted(int start, int end);
|
|
||||||
void mediaInserted(int start, int end);
|
|
||||||
|
|
||||||
void mediaAboutToBeRemoved(int start, int end);
|
|
||||||
void mediaRemoved(int start, int end);
|
|
||||||
|
|
||||||
void mediaChanged(int start, int end);
|
|
||||||
|
|
||||||
void loaded();
|
|
||||||
void loadFailed(QMediaPlaylist::Error, const QString& errorMessage);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
QMediaPlaylistProviderPrivate *d_ptr;
|
|
||||||
QMediaPlaylistProvider(QMediaPlaylistProviderPrivate &dd, QObject *parent);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Q_DECLARE_PRIVATE(QMediaPlaylistProvider)
|
|
||||||
};
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
|
|
||||||
QT_END_HEADER
|
|
||||||
|
|
||||||
|
|
||||||
#endif // QMEDIAPLAYLISTPROVIDER_H
|
|
||||||
@@ -53,6 +53,7 @@
|
|||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include "qmediacontent.h"
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
@@ -71,6 +72,54 @@ public:
|
|||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
QMediaPlaylistProvider(QObject *parent=0);
|
||||||
|
virtual ~QMediaPlaylistProvider();
|
||||||
|
|
||||||
|
virtual bool load(const QUrl &location, const char *format = 0);
|
||||||
|
virtual bool load(QIODevice * device, const char *format = 0);
|
||||||
|
virtual bool save(const QUrl &location, const char *format = 0);
|
||||||
|
virtual bool save(QIODevice * device, const char *format);
|
||||||
|
|
||||||
|
virtual int mediaCount() const = 0;
|
||||||
|
virtual QMediaContent media(int index) const = 0;
|
||||||
|
|
||||||
|
virtual bool isReadOnly() const;
|
||||||
|
|
||||||
|
virtual bool addMedia(const QMediaContent &content);
|
||||||
|
virtual bool addMedia(const QList<QMediaContent> &contentList);
|
||||||
|
virtual bool insertMedia(int index, const QMediaContent &content);
|
||||||
|
virtual bool insertMedia(int index, const QList<QMediaContent> &content);
|
||||||
|
virtual bool removeMedia(int pos);
|
||||||
|
virtual bool removeMedia(int start, int end);
|
||||||
|
virtual bool clear();
|
||||||
|
|
||||||
|
public Q_SLOTS:
|
||||||
|
virtual void shuffle();
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
void mediaAboutToBeInserted(int start, int end);
|
||||||
|
void mediaInserted(int start, int end);
|
||||||
|
|
||||||
|
void mediaAboutToBeRemoved(int start, int end);
|
||||||
|
void mediaRemoved(int start, int end);
|
||||||
|
|
||||||
|
void mediaChanged(int start, int end);
|
||||||
|
|
||||||
|
void loaded();
|
||||||
|
void loadFailed(QMediaPlaylist::Error, const QString& errorMessage);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QMediaPlaylistProviderPrivate *d_ptr;
|
||||||
|
QMediaPlaylistProvider(QMediaPlaylistProviderPrivate &dd, QObject *parent);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Q_DECLARE_PRIVATE(QMediaPlaylistProvider)
|
||||||
|
};
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
#include "qgstreamerplayersession.h"
|
#include "qgstreamerplayersession.h"
|
||||||
#include "playerresourcepolicy.h"
|
#include "playerresourcepolicy.h"
|
||||||
|
|
||||||
#include <qmediaplaylistnavigator.h>
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
|
|
||||||
#include <QtCore/qdir.h>
|
#include <QtCore/qdir.h>
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
#include "qgstreameraudioprobecontrol.h"
|
#include "qgstreameraudioprobecontrol.h"
|
||||||
#include "qgstreamervideoprobecontrol.h"
|
#include "qgstreamervideoprobecontrol.h"
|
||||||
|
|
||||||
#include <qmediaplaylistnavigator.h>
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
#include <qmediaplaylist.h>
|
#include <qmediaplaylist.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#ifndef QM3UHANDLER_H
|
#ifndef QM3UHANDLER_H
|
||||||
#define QM3UHANDLER_H
|
#define QM3UHANDLER_H
|
||||||
|
|
||||||
#include "qmediaplaylistioplugin.h"
|
#include <private/qmediaplaylistioplugin_p.h>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
QT_USE_NAMESPACE
|
QT_USE_NAMESPACE
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#include "qt7playercontrol.h"
|
#include "qt7playercontrol.h"
|
||||||
#include "qt7playersession.h"
|
#include "qt7playersession.h"
|
||||||
|
|
||||||
#include <qmediaplaylistnavigator.h>
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
#include "qt7movievideowidget.h"
|
#include "qt7movievideowidget.h"
|
||||||
#include "qt7playermetadata.h"
|
#include "qt7playermetadata.h"
|
||||||
|
|
||||||
#include <qmediaplaylistnavigator.h>
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
#include <qmediaplaylist.h>
|
#include <qmediaplaylist.h>
|
||||||
|
|
||||||
QT_USE_NAMESPACE
|
QT_USE_NAMESPACE
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
#include "qt7videooutput.h"
|
#include "qt7videooutput.h"
|
||||||
|
|
||||||
#include <QtNetwork/qnetworkcookie.h>
|
#include <QtNetwork/qnetworkcookie.h>
|
||||||
#include <qmediaplaylistnavigator.h>
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
#include <Foundation/Foundation.h>
|
#include <Foundation/Foundation.h>
|
||||||
|
|||||||
@@ -43,9 +43,9 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include "qmediaservice.h"
|
#include "qmediaservice.h"
|
||||||
#include "qmediaplaylist.h"
|
#include "qmediaplaylist.h"
|
||||||
#include "qmediaplaylistcontrol.h"
|
#include <private/qmediaplaylistcontrol_p.h>
|
||||||
#include "qmediaplaylistsourcecontrol.h"
|
#include <private/qmediaplaylistsourcecontrol_p.h>
|
||||||
#include "qmediaplaylistnavigator.h"
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
#include <private/qmediapluginloader_p.h>
|
#include <private/qmediapluginloader_p.h>
|
||||||
|
|
||||||
#include "qm3uhandler.h"
|
#include "qm3uhandler.h"
|
||||||
|
|||||||
@@ -43,8 +43,8 @@
|
|||||||
|
|
||||||
#include <QtTest/QtTest>
|
#include <QtTest/QtTest>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include "qlocalmediaplaylistprovider.h"
|
#include <private/qlocalmediaplaylistprovider_p.h>
|
||||||
#include "qmediaplaylistnavigator.h"
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
QT_USE_NAMESPACE
|
QT_USE_NAMESPACE
|
||||||
class tst_QMediaPlaylistNavigator : public QObject
|
class tst_QMediaPlaylistNavigator : public QObject
|
||||||
|
|||||||
@@ -42,8 +42,8 @@
|
|||||||
#ifndef MOCKMEDIAPLAYLISTCONTROL_H
|
#ifndef MOCKMEDIAPLAYLISTCONTROL_H
|
||||||
#define MOCKMEDIAPLAYLISTCONTROL_H
|
#define MOCKMEDIAPLAYLISTCONTROL_H
|
||||||
|
|
||||||
#include "qmediaplaylistcontrol.h"
|
#include <private/qmediaplaylistcontrol_p.h>
|
||||||
#include "qmediaplaylistnavigator.h"
|
#include <private/qmediaplaylistnavigator_p.h>
|
||||||
|
|
||||||
#include "mockreadonlyplaylistprovider.h"
|
#include "mockreadonlyplaylistprovider.h"
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#ifndef MOCKMEDIAPLAYLISTSOURCECONTROL_H
|
#ifndef MOCKMEDIAPLAYLISTSOURCECONTROL_H
|
||||||
#define MOCKMEDIAPLAYLISTSOURCECONTROL_H
|
#define MOCKMEDIAPLAYLISTSOURCECONTROL_H
|
||||||
|
|
||||||
#include "qmediaplaylistsourcecontrol.h"
|
#include <private/qmediaplaylistsourcecontrol_p.h>
|
||||||
|
|
||||||
class MockPlaylistSourceControl : public QMediaPlaylistSourceControl
|
class MockPlaylistSourceControl : public QMediaPlaylistSourceControl
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#ifndef MOCKREADONLYPLAYLISTPROVIDER_H
|
#ifndef MOCKREADONLYPLAYLISTPROVIDER_H
|
||||||
#define MOCKREADONLYPLAYLISTPROVIDER_H
|
#define MOCKREADONLYPLAYLISTPROVIDER_H
|
||||||
|
|
||||||
#include "qmediaplaylistprovider.h"
|
#include <private/qmediaplaylistprovider_p.h>
|
||||||
|
|
||||||
class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
|
class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user