diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-05 12:03:12 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:59:57 +0000 |
| commit | 856c37844b831b7786e05efd7bbc1edc5c78b564 (patch) | |
| tree | 0c4b9a34c1ea0f6641c9d26159fae6fcc058e8c0 /src/plugins | |
| parent | 9d1defda0d278cbec775087edc26fc72ea72b0ba (diff) | |
Clean up QCamera error enum
We only really need two error values, the others don't
make a whole lot of sense.
Change-Id: I8f798b1ed930ea876442390776528a32b3532e30
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameracontrol.mm | 8 | ||||
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameracontrol.mm b/src/plugins/avfoundation/camera/avfcameracontrol.mm index b36e4935d..a6bc91995 100644 --- a/src/plugins/avfoundation/camera/avfcameracontrol.mm +++ b/src/plugins/avfoundation/camera/avfcameracontrol.mm @@ -112,19 +112,13 @@ void AVFCameraControl::setCaptureMode(QCamera::CaptureModes mode) if (m_captureMode == mode) return; - if (!isCaptureModeSupported(mode)) { - Q_EMIT error(QCamera::NotSupportedFeatureError, tr("Requested capture mode is not supported")); - return; - } - m_captureMode = mode; Q_EMIT captureModeChanged(mode); } bool AVFCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const { - //all the capture modes are supported, including QCamera::CaptureStillImage | QCamera::CaptureVideo - return (mode & (QCamera::CaptureStillImage | QCamera::CaptureVideo)) == mode; + return true; } bool AVFCameraControl::canChangeProperty(QCameraControl::PropertyChangeType changeType, QCamera::Status status) const diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp index 601a09e31..5afbdd7cf 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp @@ -122,8 +122,6 @@ void QGstreamerCameraControl::setState(QCamera::State state) #endif } break; - default: - emit error(QCamera::NotSupportedFeatureError, tr("State not supported.")); } updateStatus(); |