summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback/qmediacontent.h
diff options
context:
space:
mode:
authorLev Zelenskiy <lev.zelenskiy@nokia.com>2012-03-05 12:25:50 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-12 05:29:56 +0100
commit87de0979e5ac91c7489c34b254de502d071bb72f (patch)
treeeed477b964f33d34c9e091afa8e42a1cac82bcaa /src/multimedia/playback/qmediacontent.h
parente2eaa283fb0494284304c12285c0d3c10086dfe6 (diff)
Added playlist property to QMediaContent
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>
Diffstat (limited to 'src/multimedia/playback/qmediacontent.h')
-rw-r--r--src/multimedia/playback/qmediacontent.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h
index 546d2f4f9..7b1fbbbd6 100644
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -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;
};