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/qdeclarativeaudio_p.h | |
| 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/qdeclarativeaudio_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index dd24a0744..7c50bf936 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -84,6 +84,7 @@ class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public Q Q_PROPERTY(Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT) + Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false) Q_ENUMS(Status) Q_ENUMS(Error) Q_ENUMS(Loop) @@ -126,6 +127,8 @@ public: void classBegin(); void componentComplete(); + QObject *mediaObject() { return m_mediaObject; } + public Q_SLOTS: void play(); void pause(); @@ -159,6 +162,8 @@ Q_SIGNALS: void errorChanged(); void error(QDeclarativeAudio::Error error, const QString &errorString); + void mediaObjectChanged(); + private Q_SLOTS: void _q_error(int, const QString &); |