summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-06-29 14:21:58 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-29 07:28:29 +0200
commit8bdceb93573971deb7ff4327dfa580956c8d9c03 (patch)
tree2efedcfe60147d418622fa5479b478c741447235 /src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
parentb3e8783334f339e0a1f64670b8fb0e74699f735c (diff)
Gst Capture: image capture fixes
Report camera is ready to capture only in image capture modes; Emit capture failed if camera not configured for capture Change-Id: Ia2b92e2f8c760db948185a29c3e5ceae81dd3af4 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp')
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
index ec8351202..30b1012b7 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -773,6 +773,11 @@ QGstreamerCaptureSession::State QGstreamerCaptureSession::state() const
return m_state;
}
+QGstreamerCaptureSession::State QGstreamerCaptureSession::pendingState() const
+{
+ return m_pendingState;
+}
+
void QGstreamerCaptureSession::setState(QGstreamerCaptureSession::State newState)
{
if (newState == m_pendingState && !m_waitingForEos)