summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-23 22:50:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-23 22:50:33 (GMT)
commitccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb (patch)
tree691250169f111cad7b0d3061796f37bb364c8b70 /src/multimedia
parentaf4f30abb88d242d1e310914b53bc91b24e45a59 (diff)
parent91ed4f664008577a095f5554372456661865dede (diff)
downloadQt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.zip
Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.gz
Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/base/qmediacontent.cpp13
-rw-r--r--src/multimedia/base/qmediacontent.h2
-rw-r--r--src/multimedia/qml/multimediaqml.cpp (renamed from src/multimedia/qml/qml.cpp)2
-rw-r--r--src/multimedia/qml/multimediaqml.h (renamed from src/multimedia/qml/qml.h)0
-rw-r--r--src/multimedia/qml/qmetadatacontrolmetaobject_p.h11
-rw-r--r--src/multimedia/qml/qml.pri4
-rw-r--r--src/multimedia/qml/qmlaudio_p.h11
-rw-r--r--src/multimedia/qml/qmlgraphicsvideo_p.h11
-rw-r--r--src/multimedia/qml/qmlmediabase_p.h10
-rw-r--r--src/multimedia/qml/wavedecoder_p.h11
10 files changed, 72 insertions, 3 deletions
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp
index 3e32af0..fd519c6 100644
--- a/src/multimedia/base/qmediacontent.cpp
+++ b/src/multimedia/base/qmediacontent.cpp
@@ -109,6 +109,19 @@ QMediaContent::QMediaContent(const QUrl &url):
}
/*!
+ Constructs a media content with \a request providing a reference to the content.
+
+ This constructor can be used to reference media content via network protocols such as HTTP.
+ This may include additional information required to obtain the resource, such as Cookies or HTTP headers.
+*/
+
+QMediaContent::QMediaContent(const QNetworkRequest &request):
+ d(new QMediaContentPrivate)
+{
+ d->resources << QMediaResource(request);
+}
+
+/*!
Constructs a media content with \a resource providing a reference to the content.
*/
diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/base/qmediacontent.h
index 1ea4898..b6f3017 100644
--- a/src/multimedia/base/qmediacontent.h
+++ b/src/multimedia/base/qmediacontent.h
@@ -46,6 +46,7 @@
#include <QtCore/qshareddata.h>
#include <QtMultimedia/qmediaresource.h>
+#include <QtNetwork/qnetworkrequest.h>
QT_BEGIN_HEADER
@@ -60,6 +61,7 @@ class Q_MULTIMEDIA_EXPORT QMediaContent
public:
QMediaContent();
QMediaContent(const QUrl &contentUrl);
+ QMediaContent(const QNetworkRequest &contentRequest);
QMediaContent(const QMediaResource &contentResource);
QMediaContent(const QMediaResourceList &resources);
QMediaContent(const QMediaContent &other);
diff --git a/src/multimedia/qml/qml.cpp b/src/multimedia/qml/multimediaqml.cpp
index b9ee212..be49915 100644
--- a/src/multimedia/qml/qml.cpp
+++ b/src/multimedia/qml/multimediaqml.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include <QtMultimedia/qml.h>
+#include <QtMultimedia/multimediaqml.h>
#include <QtMultimedia/private/qsoundeffect_p.h>
#include <QtMultimedia/private/qmlaudio_p.h>
#include <QtMultimedia/private/qmlgraphicsvideo_p.h>
diff --git a/src/multimedia/qml/qml.h b/src/multimedia/qml/multimediaqml.h
index 41274c8..41274c8 100644
--- a/src/multimedia/qml/qml.h
+++ b/src/multimedia/qml/multimediaqml.h
diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject_p.h b/src/multimedia/qml/qmetadatacontrolmetaobject_p.h
index c0fd4e8..ec4df05 100644
--- a/src/multimedia/qml/qmetadatacontrolmetaobject_p.h
+++ b/src/multimedia/qml/qmetadatacontrolmetaobject_p.h
@@ -42,6 +42,17 @@
#ifndef QMETADATACONTROLMETAOBJECT_P_H
#define QMETADATACONTROLMETAOJBECT_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtCore/qmetaobject.h>
#include <QtMultimedia/qtmedianamespace.h>
diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri
index e506632..a7ca02e 100644
--- a/src/multimedia/qml/qml.pri
+++ b/src/multimedia/qml/qml.pri
@@ -17,7 +17,7 @@ contains(QT_CONFIG, declarative) {
}
HEADERS += \
- $$PWD/qml.h \
+ $$PWD/multimediaqml.h \
$$PWD/qmetadatacontrolmetaobject_p.h \
$$PWD/qmlaudio_p.h \
$$PWD/qmlgraphicsvideo_p.h \
@@ -26,7 +26,7 @@ contains(QT_CONFIG, declarative) {
$$PWD/wavedecoder_p.h
SOURCES += \
- $$PWD/qml.cpp \
+ $$PWD/multimediaqml.cpp \
$$PWD/qmetadatacontrolmetaobject.cpp \
$$PWD/qmlaudio.cpp \
$$PWD/qmlgraphicsvideo.cpp \
diff --git a/src/multimedia/qml/qmlaudio_p.h b/src/multimedia/qml/qmlaudio_p.h
index f034518..bb0d301 100644
--- a/src/multimedia/qml/qmlaudio_p.h
+++ b/src/multimedia/qml/qmlaudio_p.h
@@ -42,6 +42,17 @@
#ifndef QMLAUDIO_P_H
#define QMLAUDIO_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtMultimedia/private/qmlmediabase_p.h>
#include <QtCore/qbasictimer.h>
diff --git a/src/multimedia/qml/qmlgraphicsvideo_p.h b/src/multimedia/qml/qmlgraphicsvideo_p.h
index a4f8e32..26252e0 100644
--- a/src/multimedia/qml/qmlgraphicsvideo_p.h
+++ b/src/multimedia/qml/qmlgraphicsvideo_p.h
@@ -42,6 +42,17 @@
#ifndef QMLGRAPHICSVIDEO_H
#define QMLGRAPHICSVIDEO_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtMultimedia/private/qmlmediabase_p.h>
#include <QtMultimedia/qgraphicsvideoitem.h>
diff --git a/src/multimedia/qml/qmlmediabase_p.h b/src/multimedia/qml/qmlmediabase_p.h
index 948a0e8..d6ad9b3 100644
--- a/src/multimedia/qml/qmlmediabase_p.h
+++ b/src/multimedia/qml/qmlmediabase_p.h
@@ -42,6 +42,16 @@
#ifndef QMLMEDIABASE_P_H
#define QMLMEDIABASE_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qbasictimer.h>
#include <QtMultimedia/qmediaplayer.h>
diff --git a/src/multimedia/qml/wavedecoder_p.h b/src/multimedia/qml/wavedecoder_p.h
index 3bcd90d..00aa14e 100644
--- a/src/multimedia/qml/wavedecoder_p.h
+++ b/src/multimedia/qml/wavedecoder_p.h
@@ -42,6 +42,17 @@
#ifndef WAVEDECODER_H
#define WAVEDECODER_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtCore/qiodevice.h>
#include <QtMultimedia/qaudioformat.h>