diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-02-10 19:33:51 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@digia.com> | 2014-07-17 18:58:00 +0200 |
commit | 888759e334e81117843afb6d0f8991db8aec5ca8 (patch) | |
tree | d0b6eb0b094557d5c25bf865998915f0839d596d /src/imports/multimedia/multimedia.cpp | |
parent | cddbe8736d995b4bfdfbbf1abfc3d6aeae3eb214 (diff) |
New camera selection API in QML.
Also added a new QtMultimedia global object which makes it possible
to retrieve the list of available cameras. It can be extended with
new utility functions in the future.
Includes documentation, example and auto tests.
Task-number: QTBUG-23770
Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 18c74e006..99d6ba422 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -47,6 +47,7 @@ #include <private/qdeclarativevideooutput_p.h> +#include "qdeclarativemultimediaglobal_p.h" #include "qdeclarativemediametadata_p.h" #include "qdeclarativeaudio_p.h" #include "qdeclarativeradio_p.h" @@ -73,15 +74,14 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")); + // 5.0 types qmlRegisterType<QSoundEffect>(uri, 5, 0, "SoundEffect"); qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "Audio"); qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "MediaPlayer"); qmlRegisterType<QDeclarativeVideoOutput>(uri, 5, 0, "VideoOutput"); - qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput"); qmlRegisterType<QDeclarativeRadio>(uri, 5, 0, "Radio"); qmlRegisterType<QDeclarativeRadioData>(uri, 5, 0, "RadioData"); qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera"); - qmlRegisterRevision<QDeclarativeCamera, 1>(uri, 5, 4); qmlRegisterType<QDeclarativeTorch>(uri, 5, 0, "Torch"); qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture", trUtf8("CameraCapture is provided by Camera")); @@ -96,11 +96,18 @@ public: qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera")); - // Make types available for the 5.3 version - // Adding "import QtMultimedia 5.3" in QML will fail unless at least one type is registered - // for that version. + // 5.2 types + qmlRegisterRevision<QDeclarativeVideoOutput, 2>(uri, 5, 2); + + // 5.3 types + // Nothing changed, but adding "import QtMultimedia 5.3" in QML will fail unless at + // least one type is registered for that version. qmlRegisterType<QSoundEffect>(uri, 5, 3, "SoundEffect"); + // 5.4 types + qmlRegisterSingletonType(uri, 5, 4, "QtMultimedia", QDeclarativeMultimedia::initGlobalObject); + qmlRegisterRevision<QDeclarativeCamera, 1>(uri, 5, 4); + qmlRegisterType<QDeclarativeMediaMetaData>(); } |