Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit

Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h b/src/plugins/gstreamer/camerabin/camerabinimagecapture.h
index 6cc910dbe..4a902e96f 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.h
@@ -48,9 +48,10 @@
 
 QT_USE_NAMESPACE
 
-class CameraBinImageCapture : public QCameraImageCaptureControl
+class CameraBinImageCapture : public QCameraImageCaptureControl, public QGstreamerBusMessageFilter
 {
     Q_OBJECT
+    Q_INTERFACES(QGstreamerBusMessageFilter)
 public:
     CameraBinImageCapture(CameraBinSession *session);
     virtual ~CameraBinImageCapture();
@@ -62,15 +63,15 @@ public:
     int capture(const QString &fileName);
     void cancelCapture();
 
+    bool processBusMessage(const QGstreamerMessage &message);
+
 private slots:
     void updateState();
-    void handleBusMessage(const QGstreamerMessage &message);
 
 private:
     static gboolean metadataEventProbe(GstPad *pad, GstEvent *event, CameraBinImageCapture *);
     static gboolean uncompressedBufferProbe(GstPad *pad, GstBuffer *buffer, CameraBinImageCapture *);
     static gboolean jpegBufferProbe(GstPad *pad, GstBuffer *buffer, CameraBinImageCapture *);
-    static gboolean handleImageSaved(GstElement *camera, const gchar *filename, CameraBinImageCapture *);
 
     CameraBinSession *m_session;
     bool m_ready;