diff options
author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2018-02-05 12:21:40 +0100 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2018-02-14 08:06:56 +0000 |
commit | 2cc31ddded7b83dc47ddd6dde0c234e51caa9d88 (patch) | |
tree | 505568eb749aa6c874a73b69105280c226baf38d | |
parent | c98c346d12b1a6ba99d18059db5b941d6138b081 (diff) | |
download | qtmultimedia-2cc31ddded7b83dc47ddd6dde0c234e51caa9d88.tar.gz |
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>
(cherry picked from commit 038716bb1f2d9b95f2d638e2d61d297563343af9)
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index f06d95ea3..4941c6ef6 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -729,21 +729,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(); |