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>
This commit is contained in:
committed by
Qt by Nokia
parent
e70ebfd2ed
commit
abee3a6548
@@ -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 &);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user