diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-10 15:09:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 15:38:24 +0000 |
| commit | 3c59ba2b3ce96f578b2d677ecc1fbf7da0b2e27f (patch) | |
| tree | 8bf1df70cb5e264a5674d0eb513841d8dec12251 /src/multimedia/controls | |
| parent | 1920146be1193a1136bd279f8036778e8c9c4083 (diff) | |
Remove camera locking API
QCamera::lock()/unlock() is something that's not needed
these days anymore. cameras will automatically focus anyway,
there's no real reason to lock the focus (or other properties)
to some specific value in 99% of the cases.
Plus it wasn't supported on Linux or macOS/iOS anyway.
Change-Id: I437d29cbb768da3ece42eea8d753eeafa0c534ae
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/qcameracontrol.cpp | 30 | ||||
| -rw-r--r-- | src/multimedia/controls/qcameracontrol.h | 8 |
2 files changed, 0 insertions, 38 deletions
diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index 205f058df..9dcefd6ed 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -192,36 +192,6 @@ QCameraControl::QCameraControl(QObject *parent) */ /*! - \fn QCameraControl::supportedLocks() const - - Returns the lock types, the camera supports. -*/ - -/*! - \fn QCameraControl::lockStatus(QCamera::LockType lock) const - - Returns the camera \a lock status. -*/ - -/*! - \fn QCameraControl::searchAndLock(QCamera::LockTypes locks) - - Request camera \a locks. -*/ - -/*! - \fn QCameraControl::unlock(QCamera::LockTypes locks) - - Unlock camera \a locks. -*/ - -/*! - \fn QCameraControl::lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason) - - Signals the lock \a type \a status was changed with the specified \a reason. -*/ - -/*! \fn QCameraControl::supportedViewfinderSettings() const Returns a list of supported camera viewfinder settings. diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 8074381f0..bfe33b363 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -78,13 +78,6 @@ public: virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0; - virtual QCamera::LockTypes supportedLocks() const = 0; - - virtual QCamera::LockStatus lockStatus(QCamera::LockType lock) const = 0; - - virtual void searchAndLock(QCamera::LockTypes locks) = 0; - virtual void unlock(QCamera::LockTypes locks) = 0; - virtual QCameraFocusControl *focusControl() { return nullptr; } virtual QCameraExposureControl *exposureControl() { return nullptr; } virtual QCameraImageProcessingControl *imageProcessingControl() { return nullptr; } @@ -94,7 +87,6 @@ Q_SIGNALS: void statusChanged(QCamera::Status); void error(int error, const QString &errorString); void captureModeChanged(QCamera::CaptureModes mode); - void lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason); protected: explicit QCameraControl(QObject *parent = nullptr); |