diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2011-08-08 15:57:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-11 08:14:24 +0200 |
| commit | abee3a6548e84a1df91590c26718d43bb846dc0b (patch) | |
| tree | 67655a6ca4e12fa16ee81106d5195f6eb7737c5a /src/imports/multimedia/multimedia.cpp | |
| parent | e70ebfd2ed8d522478f04ab823b527b48ed24671 (diff) | |
Initial implementation of QML2 VideoOutput element
Change-Id: I5ed00433fe5e993086ae1698b7344c8d60a5f0f6
Reviewed-on: http://codereview.qt.nokia.com/2727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index b274830fe..18684d578 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -47,8 +47,8 @@ #include "qdeclarativemediametadata_p.h" #include "qdeclarativeaudio_p.h" +#include "qdeclarativevideooutput_p.h" #if 0 -#include "qdeclarativevideo_p.h" #include "qdeclarativecamera_p.h" #include "qdeclarativecamerapreviewprovider_p.h" #endif @@ -67,9 +67,10 @@ public: qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect"); qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio"); + qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "MediaPlayer"); + qmlRegisterType<QDeclarativeVideoOutput>(uri, 4, 0, "VideoOutput"); /* Disabled until ported to scenegraph */ #if 0 - qmlRegisterType<QDeclarativeVideo>(uri, 4, 0, "Video"); qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera"); #endif qmlRegisterType<QDeclarativeMediaMetaData>(); |