diff options
author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-03-06 12:23:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 07:54:47 +0100 |
commit | 10b006340191d14d33f7f6b7f94a6e13eb8acea5 (patch) | |
tree | 7de99dd6d6de70472fc278586ae4a994bf77dc4e /src/multimedia/playback | |
parent | cb390351620e05d827c258c94a5cc19f314fbe46 (diff) |
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>
Diffstat (limited to 'src/multimedia/playback')
-rw-r--r-- | src/multimedia/playback/playback.pri | 9 | ||||
-rw-r--r-- | src/multimedia/playback/qlocalmediaplaylistprovider.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qlocalmediaplaylistprovider_p.h (renamed from src/multimedia/playback/qlocalmediaplaylistprovider.h) | 21 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylist.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylist_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistioplugin.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistioplugin_p.h (renamed from src/multimedia/playback/qmediaplaylistioplugin.h) | 17 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistnavigator.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistnavigator_p.h (renamed from src/multimedia/playback/qmediaplaylistnavigator.h) | 21 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider.cpp | 3 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider.h | 115 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider_p.h | 49 |
13 files changed, 117 insertions, 150 deletions
diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/playback/playback.pri index f43f608f1..284c9f8e6 100644 --- a/src/multimedia/playback/playback.pri +++ b/src/multimedia/playback/playback.pri @@ -2,18 +2,17 @@ INCLUDEPATH += playback PUBLIC_HEADERS += \ playback/qaudioendpointselector.h \ - playback/qlocalmediaplaylistprovider.h \ playback/qmediacontent.h \ playback/qmediaplayer.h \ playback/qmediaplaylist.h \ - playback/qmediaplaylistioplugin.h \ - playback/qmediaplaylistnavigator.h \ - playback/qmediaplaylistprovider.h \ playback/qmediaresource.h PRIVATE_HEADERS += \ 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 += \ playback/qaudioendpointselector.cpp \ diff --git a/src/multimedia/playback/qlocalmediaplaylistprovider.cpp b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp index ec00e66c4..051f76a9b 100644 --- a/src/multimedia/playback/qlocalmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qlocalmediaplaylistprovider.h" +#include "qlocalmediaplaylistprovider_p.h" #include "qmediaplaylistprovider_p.h" #include "qmediacontent.h" @@ -189,6 +189,6 @@ void QLocalMediaPlaylistProvider::shuffle() } -#include "moc_qlocalmediaplaylistprovider.cpp" +#include "moc_qlocalmediaplaylistprovider_p.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/playback/qlocalmediaplaylistprovider.h b/src/multimedia/playback/qlocalmediaplaylistprovider_p.h index 8fc3de5b1..879e8f715 100644 --- a/src/multimedia/playback/qlocalmediaplaylistprovider.h +++ b/src/multimedia/playback/qlocalmediaplaylistprovider_p.h @@ -39,10 +39,21 @@ ** ****************************************************************************/ -#ifndef QLOCALMEDIAPAYLISTPROVIDER_H -#define QLOCALMEDIAPAYLISTPROVIDER_H - -#include "qmediaplaylistprovider.h" +#ifndef QLOCALMEDIAPAYLISTPROVIDER_P_H +#define QLOCALMEDIAPAYLISTPROVIDER_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 "qmediaplaylistprovider_p.h" QT_BEGIN_HEADER @@ -84,4 +95,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QLOCALMEDIAPAYLISTSOURCE_H +#endif // QLOCALMEDIAPAYLISTSOURCE_P_H diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 0375f5e93..f9b60f587 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -47,8 +47,8 @@ #include <qmediaplayercontrol.h> #include <qmediaserviceprovider_p.h> #include <qmediaplaylist.h> -#include <qmediaplaylistcontrol.h> -#include <qmediaplaylistsourcecontrol.h> +#include <qmediaplaylistcontrol_p.h> +#include <qmediaplaylistsourcecontrol_p.h> #include <qmedianetworkaccesscontrol.h> diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 67db7f554..860fca2cc 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -41,11 +41,11 @@ #include "qmediaplaylist.h" #include "qmediaplaylist_p.h" -#include "qmediaplaylistprovider.h" -#include "qlocalmediaplaylistprovider.h" -#include "qmediaplaylistioplugin.h" +#include "qmediaplaylistprovider_p.h" +#include "qlocalmediaplaylistprovider_p.h" +#include "qmediaplaylistioplugin_p.h" #include "qmediaservice.h" -#include "qmediaplaylistcontrol.h" +#include "qmediaplaylistcontrol_p.h" #include "qmediaplayercontrol.h" #include <QtCore/qlist.h> diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h index a6ad00d19..7d718da2a 100644 --- a/src/multimedia/playback/qmediaplaylist_p.h +++ b/src/multimedia/playback/qmediaplaylist_p.h @@ -54,10 +54,10 @@ // #include "qmediaplaylist.h" -#include "qmediaplaylistcontrol.h" +#include "qmediaplaylistcontrol_p.h" #include "qmediaplayer.h" #include "qmediaplayercontrol.h" -#include "qlocalmediaplaylistprovider.h" +#include "qlocalmediaplaylistprovider_p.h" #include "qmediaobject_p.h" #include <QtCore/qdebug.h> diff --git a/src/multimedia/playback/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp index 084c55d65..99ff8b038 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin.cpp +++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmediaplaylistioplugin.h" +#include "qmediaplaylistioplugin_p.h" QT_BEGIN_NAMESPACE @@ -117,6 +117,8 @@ QMediaPlaylistWriter::~QMediaPlaylistWriter() /*! \class QMediaPlaylistIOPlugin + \internal + \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. */ -#include "moc_qmediaplaylistioplugin.cpp" +#include "moc_qmediaplaylistioplugin_p.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistioplugin.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 64f4056c6..60a12cd4a 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QMEDIAPLAYLISTIOPLUGIN_H -#define QMEDIAPLAYLISTIOPLUGIN_H +#ifndef QMEDIAPLAYLISTIOPLUGIN_P_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/qplugin.h> @@ -123,4 +134,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QMEDIAPLAYLISTIOPLUGIN_H +#endif // QMEDIAPLAYLISTIOPLUGIN_P_H diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp index 414f735db..f0a02c2c7 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator.cpp +++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmediaplaylistnavigator.h" -#include "qmediaplaylistprovider.h" +#include "qmediaplaylistnavigator_p.h" +#include "qmediaplaylistprovider_p.h" #include "qmediaplaylist.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. */ -#include "moc_qmediaplaylistnavigator.cpp" +#include "moc_qmediaplaylistnavigator_p.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistnavigator.h b/src/multimedia/playback/qmediaplaylistnavigator_p.h index 60061c22a..ab517473a 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator.h +++ b/src/multimedia/playback/qmediaplaylistnavigator_p.h @@ -39,10 +39,21 @@ ** ****************************************************************************/ -#ifndef QMEDIAPLAYLISTNAVIGATOR_H -#define QMEDIAPLAYLISTNAVIGATOR_H - -#include "qmediaplaylistprovider.h" +#ifndef QMEDIAPLAYLISTNAVIGATOR_P_H +#define QMEDIAPLAYLISTNAVIGATOR_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 "qmediaplaylistprovider_p.h" #include "qmediaplaylist.h" #include <QtCore/qobject.h> @@ -112,4 +123,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QMEDIAPLAYLISTNAVIGATOR_H +#endif // QMEDIAPLAYLISTNAVIGATOR_P_H diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp index c3e62a1dd..ddc6b9249 100644 --- a/src/multimedia/playback/qmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qmediaplaylistprovider.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include "qmediaplaylistprovider.h" #include "qmediaplaylistprovider_p.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. */ -#include "moc_qmediaplaylistprovider.cpp" +#include "moc_qmediaplaylistprovider_p.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistprovider.h b/src/multimedia/playback/qmediaplaylistprovider.h deleted file mode 100644 index 63fcb112a..000000000 --- a/src/multimedia/playback/qmediaplaylistprovider.h +++ /dev/null @@ -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 diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h index 6848f750b..7e816f8c8 100644 --- a/src/multimedia/playback/qmediaplaylistprovider_p.h +++ b/src/multimedia/playback/qmediaplaylistprovider_p.h @@ -53,6 +53,7 @@ // We mean it. // +#include "qmediacontent.h" #include "qmediaplaylist.h" 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_HEADER |