--- a/qtmobility/src/multimedia/qgraphicsvideoitem.h Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem.h Wed Jun 23 19:08:38 2010 +0300
@@ -44,7 +44,8 @@
#include <QtGui/qgraphicsitem.h>
-#include "qvideowidget.h"
+#include <qvideowidget.h>
+#include <qmediabindableinterface.h>
QT_BEGIN_NAMESPACE
class QVideoSurfaceFormat;
@@ -53,9 +54,10 @@
QT_BEGIN_NAMESPACE
class QGraphicsVideoItemPrivate;
-class Q_MEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject
+class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface
{
Q_OBJECT
+ Q_INTERFACES(QMediaBindableInterface)
Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject)
Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode)
Q_PROPERTY(QPointF offset READ offset WRITE setOffset)
@@ -65,8 +67,7 @@
QGraphicsVideoItem(QGraphicsItem *parent = 0);
~QGraphicsVideoItem();
- QMediaObject *mediaObject() const;
- void setMediaObject(QMediaObject *object);
+ QMediaObject *mediaObject() const;
Qt::AspectRatioMode aspectRatioMode() const;
void setAspectRatioMode(Qt::AspectRatioMode mode);
@@ -90,6 +91,8 @@
void timerEvent(QTimerEvent *event);
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+ bool setMediaObject(QMediaObject *object);
+
QGraphicsVideoItemPrivate *d_ptr;
private:
@@ -97,7 +100,6 @@
Q_PRIVATE_SLOT(d_func(), void _q_present())
Q_PRIVATE_SLOT(d_func(), void _q_formatChanged(const QVideoSurfaceFormat &))
Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())
- Q_PRIVATE_SLOT(d_func(), void _q_mediaObjectDestroyed())
};
QT_END_NAMESPACE