From 038716bb1f2d9b95f2d638e2d61d297563343af9 Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 5 Feb 2018 12:21:40 +0100
Subject: [PATCH] Revert "GStreamer: Prevent calling
CameraBinSession::setStateHelper twice"
This reverts commit 9caee039533168fbb546b563859770414e54fc94.
Reverted due to GST_STATE_PLAYING is never set.
Task-number: QTBUG-66196
Change-Id: I85cf47c747b1e153265f2eee6477124f4683a574
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
src/plugins/gstreamer/camerabin/camerabinsession.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index cfac61c01..823cfe408 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -732,21 +732,18 @@ void CameraBinSession::setState(QCamera::State newState)
if (newState == m_pendingState)
return;
- emit pendingStateChanged(newState);
+ m_pendingState = newState;
+ emit pendingStateChanged(m_pendingState);
#if CAMERABIN_DEBUG
qDebug() << Q_FUNC_INFO << newState;
#endif
setStateHelper(newState);
- m_pendingState = newState;
}
void CameraBinSession::setStateHelper(QCamera::State state)
{
- if (state == m_pendingState)
- return;
-
switch (state) {
case QCamera::UnloadedState:
unload();
--
GitLab