--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Mon May 03 13:18:40 2010 +0300
@@ -57,7 +57,6 @@
 class QGstreamerBusHelper;
 class QGstreamerAudioEncode;
 class QGstreamerVideoEncode;
-class QGstreamerImageEncode;
 class QGstreamerRecorderControl;
 class QGstreamerMediaContainerControl;
 
@@ -95,7 +94,6 @@
 
     QGstreamerAudioEncode *audioEncodeControl() const { return m_audioEncodeControl; }
     QGstreamerVideoEncode *videoEncodeControl() const { return m_videoEncodeControl; }
-    QGstreamerImageEncode *imageEncodeControl() const { return m_imageEncodeControl; }
 
     QGstreamerRecorderControl *recorderControl() const { return m_recorderControl; }
     QGstreamerMediaContainerControl *mediaContainerControl() const { return m_mediaContainerControl; }
@@ -112,8 +110,6 @@
     QGstreamerElementFactory *videoPreview() const { return m_videoPreviewFactory; }
     void setVideoPreview(QGstreamerElementFactory *videoPreview);
 
-    void captureImage(const QString &fileName);
-
     State state() const;
     qint64 duration() const;
 
@@ -123,7 +119,6 @@
     void stateChanged(QGstreamerCaptureSession::State state);
     void durationChanged(qint64 duration);
     void error(int error, const QString &errorString);
-    void imageCaptured(const QString &fileName, const QImage &img);
 
 public slots:
     void setState(QGstreamerCaptureSession::State);
@@ -144,7 +139,6 @@
     GstElement *buildAudioPreview();
     GstElement *buildVideoSrc();
     GstElement *buildVideoPreview();
-    GstElement *buildImageCapture();
 
     void waitForStopped();
     bool rebuildGraph(QGstreamerCaptureSession::PipelineMode newMode);
@@ -153,6 +147,7 @@
     QString m_captureDevice;
     State m_state;
     State m_pendingState;
+    bool m_waitingForEos;
     PipelineMode m_pipelineMode;
     QGstreamerCaptureSession::CaptureMode m_captureMode;
     QMap<QByteArray, QVariant> m_metaData;
@@ -164,7 +159,6 @@
 
     QGstreamerAudioEncode *m_audioEncodeControl;
     QGstreamerVideoEncode *m_videoEncodeControl;
-    QGstreamerImageEncode *m_imageEncodeControl;
     QGstreamerRecorderControl *m_recorderControl;
     QGstreamerMediaContainerControl *m_mediaContainerControl;