diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-03-01 16:51:18 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-16 07:41:30 +0000 |
commit | e7702afc9dfa6e69b1b05d68a38248ccc6b6dd87 (patch) | |
tree | 8d8cfbd6b2ac894dcbb250d9084c7cff099a0b65 /src/imports/multimedia/qdeclarativecameraimageprocessing.cpp | |
parent | 7ac9e201ab41f76763477821216665d474ce5ec6 (diff) |
Simplify state handling in QCamera and QMediaRecorder
Remove the loaded/unloaded states. Instead simply have
a boolean indicating whether the camera is active.
Change-Id: I1dad15f2c4f2f606f6d64320cea3763d1213a09b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraimageprocessing.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraimageprocessing.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp index 78c1ee25b..d6c7c2ab8 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp @@ -86,10 +86,8 @@ QDeclarativeCameraImageProcessing::QDeclarativeCameraImageProcessing(QCamera *ca m_imageProcessing = camera->imageProcessing(); connect(camera, &QCamera::statusChanged, [this](QCamera::Status status) { - if (status != QCamera::UnloadedStatus && status != QCamera::LoadedStatus - && status != QCamera::ActiveStatus) { + if (status != QCamera::InactiveStatus && status != QCamera::ActiveStatus) return; - } emit supportedColorFiltersChanged(); emit supportedWhiteBalanceModesChanged(); |