equal
deleted
inserted
replaced
40 ****************************************************************************/ |
40 ****************************************************************************/ |
41 |
41 |
42 #include <QtCore/qurl.h> |
42 #include <QtCore/qurl.h> |
43 #include <QtCore/qvariant.h> |
43 #include <QtCore/qvariant.h> |
44 |
44 |
45 #include <qmediacontent.h> |
45 #include "qmediacontent.h" |
46 |
46 |
47 QTM_BEGIN_NAMESPACE |
47 QTM_BEGIN_NAMESPACE |
48 |
48 |
49 |
49 |
50 class QMediaContentPrivate : public QSharedData |
50 class QMediaContentPrivate : public QSharedData |
105 { |
105 { |
106 d->resources << QMediaResource(url); |
106 d->resources << QMediaResource(url); |
107 } |
107 } |
108 |
108 |
109 /*! |
109 /*! |
|
110 Constructs a media content with \a request providing a reference to the content. |
|
111 |
|
112 This constructor can be used to reference media content via network protocols such as HTTP. |
|
113 This may include additional information required to obtain the resource, such as Cookies or HTTP headers. |
|
114 */ |
|
115 |
|
116 QMediaContent::QMediaContent(const QNetworkRequest &request): |
|
117 d(new QMediaContentPrivate) |
|
118 { |
|
119 d->resources << QMediaResource(request); |
|
120 } |
|
121 |
|
122 /*! |
110 Constructs a media content with \a resource providing a reference to the content. |
123 Constructs a media content with \a resource providing a reference to the content. |
111 */ |
124 */ |
112 |
125 |
113 QMediaContent::QMediaContent(const QMediaResource &resource): |
126 QMediaContent::QMediaContent(const QMediaResource &resource): |
114 d(new QMediaContentPrivate) |
127 d(new QMediaContentPrivate) |
189 { |
202 { |
190 return canonicalResource().url(); |
203 return canonicalResource().url(); |
191 } |
204 } |
192 |
205 |
193 /*! |
206 /*! |
|
207 Returns a QNetworkRequest that represents that canonical resource for this media content. |
|
208 */ |
|
209 |
|
210 QNetworkRequest QMediaContent::canonicalRequest() const |
|
211 { |
|
212 return canonicalResource().request(); |
|
213 } |
|
214 |
|
215 /*! |
194 Returns a QMediaResource that represents that canonical resource for this media content. |
216 Returns a QMediaResource that represents that canonical resource for this media content. |
195 */ |
217 */ |
196 |
218 |
197 QMediaResource QMediaContent::canonicalResource() const |
219 QMediaResource QMediaContent::canonicalResource() const |
198 { |
220 { |