summaryrefslogtreecommitdiffstats
path: root/src/multimedia/controls
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/controls')
-rw-r--r--src/multimedia/controls/qcameracontrol.cpp33
-rw-r--r--src/multimedia/controls/qcameracontrol.h6
2 files changed, 0 insertions, 39 deletions
diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp
index 9dcefd6ed..efd0a920a 100644
--- a/src/multimedia/controls/qcameracontrol.cpp
+++ b/src/multimedia/controls/qcameracontrol.cpp
@@ -136,39 +136,6 @@ QCameraControl::QCameraControl(QObject *parent)
*/
/*!
- \fn Camera::CaptureModes QCameraControl::captureMode() const = 0
-
- Returns the current capture mode.
-*/
-
-/*!
- \fn void QCameraControl::setCaptureMode(QCamera::CaptureModes mode) = 0;
-
- Sets the current capture \a mode.
-
- The capture mode changes are synchronous and allowed in any camera state.
-
- If the capture mode is changed while camera is active,
- it's recommended to change status to QCamera::LoadedStatus
- and start activating the camera in the next event loop
- with the status changed to QCamera::StartingStatus.
- This allows the capture settings to be applied before camera is started.
- Than change the status to QCamera::StartedStatus when the capture mode change is done.
-*/
-
-/*!
- \fn bool QCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const = 0;
-
- Returns true if the capture \a mode is suported.
-*/
-
-/*!
- \fn QCameraControl::captureModeChanged(QCamera::CaptureModes mode)
-
- Signal emitted when the camera capture \a mode changes.
- */
-
-/*!
\fn bool QCameraControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
Returns true if backend can effectively apply changing camera properties of \a changeType type
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h
index 68e049d30..0541e26aa 100644
--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -60,7 +60,6 @@ class Q_MULTIMEDIA_EXPORT QCameraControl : public QObject
public:
enum PropertyChangeType {
- CaptureMode = 1,
ImageEncodingSettings = 2,
VideoEncodingSettings = 3,
Viewfinder = 4,
@@ -73,10 +72,6 @@ public:
virtual void setCamera(const QCameraInfo &camera) = 0;
- virtual QCamera::CaptureModes captureMode() const = 0;
- virtual void setCaptureMode(QCamera::CaptureModes) = 0;
- virtual bool isCaptureModeSupported(QCamera::CaptureModes mode) const = 0;
-
virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0;
virtual QCameraFocusControl *focusControl() { return nullptr; }
@@ -89,7 +84,6 @@ Q_SIGNALS:
void stateChanged(QCamera::State);
void statusChanged(QCamera::Status);
void error(int error, const QString &errorString);
- void captureModeChanged(QCamera::CaptureModes mode);
protected:
explicit QCameraControl(QObject *parent = nullptr);