diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 14:42:21 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 15:34:30 +1000 |
| commit | 3bf236cc23c2e67e1b5cbc01e05e61263528fc10 (patch) | |
| tree | b6b547e7863a929a2638528cddfd52c0fff6f8d9 /src/plugins/gstreamer/qgstreamervideowindow.h | |
| parent | 4ddffcdae313bf494ac12d098743af341add77e3 (diff) | |
| parent | 47a5dd4371bfc6774790cc900e287f5def12406a (diff) | |
Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
Diffstat (limited to 'src/plugins/gstreamer/qgstreamervideowindow.h')
| -rw-r--r-- | src/plugins/gstreamer/qgstreamervideowindow.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/qgstreamervideowindow.h b/src/plugins/gstreamer/qgstreamervideowindow.h index acc22cdca..3a483e2c1 100644 --- a/src/plugins/gstreamer/qgstreamervideowindow.h +++ b/src/plugins/gstreamer/qgstreamervideowindow.h @@ -45,6 +45,7 @@ #include <qvideowindowcontrol.h> #include "qgstreamervideorendererinterface.h" +#include "qgstreamerbushelper.h" QT_BEGIN_NAMESPACE class QAbstractVideoSurface; @@ -55,10 +56,12 @@ class QX11VideoSurface; QT_USE_NAMESPACE -class QGstreamerVideoWindow : public QVideoWindowControl, public QGstreamerVideoRendererInterface +class QGstreamerVideoWindow : public QVideoWindowControl, + public QGstreamerVideoRendererInterface, + public QGstreamerSyncMessageFilter { Q_OBJECT - Q_INTERFACES(QGstreamerVideoRendererInterface) + Q_INTERFACES(QGstreamerVideoRendererInterface QGstreamerSyncMessageFilter) Q_PROPERTY(QColor colorKey READ colorKey WRITE setColorKey) Q_PROPERTY(bool autopaintColorKey READ autopaintColorKey WRITE setAutopaintColorKey) public: @@ -103,7 +106,7 @@ public: GstElement *videoSink(); - void precessNewStream(); + bool processSyncMessage(const QGstreamerMessage &message); bool isReady() const { return m_windowId != 0; } signals: |