slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added playlist property to QMediaContent

Browse Source 
This is a part of changes to QMediaPlayer related to playlist handling.
Updated unit test.

Change-Id: Ic2460dc4d3121788cd5eb08df71e6d45aac032bc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-03-05 12:25:50 +10:00
committed by Qt by Nokia
parent e2eaa283fb
commit 87de0979e5
3 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/playback/qmediacontent.h
View File

@@ -49,13 +49,13 @@
#include <qtmultimediadefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylist;
class QMediaContentPrivate;
class Q_MULTIMEDIA_EXPORT QMediaContent
@@ -67,6 +67,7 @@ public:
QMediaContent(const QMediaResource &contentResource);
QMediaContent(const QMediaResourceList &resources);
QMediaContent(const QMediaContent &other);
QMediaContent(QMediaPlaylist *playlist, const QUrl &contentUrl = QUrl(), bool takeOwnership = false);
~QMediaContent();
QMediaContent& operator=(const QMediaContent &other);
@@ -82,6 +83,7 @@ public:
QMediaResourceList resources() const;
QMediaPlaylist *playlist() const;
private:
QSharedDataPointer<QMediaContentPrivate> d;
};