summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/camera/qcameraexposure.cpp75
-rw-r--r--src/multimedia/camera/qcameraexposure.h17
-rw-r--r--src/multimedia/controls/qcameraexposurecontrol.cpp5
-rw-r--r--src/multimedia/controls/qcameraexposurecontrol.h2
-rw-r--r--src/multimedia/qmediametadata.cpp2
-rw-r--r--src/multimedia/qmediametadata.h2
6 files changed, 0 insertions, 103 deletions
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 022dea28c..382e58bea 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -67,7 +67,6 @@ static void qRegisterCameraExposureMetaTypes()
{
qRegisterMetaType<QCameraExposure::ExposureMode>("QCameraExposure::ExposureMode");
qRegisterMetaType<QCameraExposure::FlashModes>("QCameraExposure::FlashModes");
- qRegisterMetaType<QCameraExposure::MeteringMode>("QCameraExposure::MeteringMode");
}
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraExposureMetaTypes)
@@ -309,72 +308,6 @@ void QCameraExposure::setExposureCompensation(qreal ev)
d_func()->setExposureParameter<qreal>(QCameraExposureControl::ExposureCompensation, ev);
}
-/*!
- \property QCameraExposure::meteringMode
- \brief The metering mode being used.
-
- \sa QCameraExposure::isMeteringModeSupported()
-*/
-
-QCameraExposure::MeteringMode QCameraExposure::meteringMode() const
-{
- return d_func()->actualExposureParameter<QCameraExposure::MeteringMode>(QCameraExposureControl::MeteringMode, QCameraExposure::MeteringMatrix);
-}
-
-void QCameraExposure::setMeteringMode(QCameraExposure::MeteringMode mode)
-{
- d_func()->setExposureParameter<QCameraExposure::MeteringMode>(QCameraExposureControl::MeteringMode, mode);
-}
-
-/*!
- \fn QCameraExposure::spotMeteringPoint() const
-
- When supported, the spot metering point is the (normalized) position of the point of the image
- where exposure metering will be performed. This is typically used to indicate an
- "interesting" area of the image that should be exposed properly.
-
- The coordinates are relative frame coordinates:
- QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center,
- which is typically the default spot metering point.
-
- The spot metering point is only used with spot metering mode.
-
- \sa setSpotMeteringPoint()
-*/
-
-QPointF QCameraExposure::spotMeteringPoint() const
-{
- return d_func()->exposureControl ? d_func()->exposureControl->actualValue(QCameraExposureControl::SpotMeteringPoint).toPointF() : QPointF();
-}
-
-/*!
- \fn QCameraExposure::setSpotMeteringPoint(const QPointF &point)
-
- Allows setting the spot metering point to \a point.
-
- \sa spotMeteringPoint()
-*/
-
-void QCameraExposure::setSpotMeteringPoint(const QPointF &point)
-{
- if (d_func()->exposureControl)
- d_func()->exposureControl->setValue(QCameraExposureControl::SpotMeteringPoint, point);
-}
-
-
-/*!
- Returns true if the metering \a mode is supported.
-*/
-bool QCameraExposure::isMeteringModeSupported(QCameraExposure::MeteringMode mode) const
-{
- if (!d_func()->exposureControl)
- return false;
-
- bool continuous = false;
- return d_func()->exposureControl->supportedParameterRange(QCameraExposureControl::MeteringMode, &continuous)
- .contains(QVariant::fromValue<QCameraExposure::MeteringMode>(mode));
-}
-
int QCameraExposure::isoSensitivity() const
{
return d_func()->actualExposureParameter<int>(QCameraExposureControl::ISO, -1);
@@ -652,14 +585,6 @@ void QCameraExposure::setAutoShutterSpeed()
*/
/*!
- \enum QCameraExposure::MeteringMode
-
- \value MeteringMatrix Matrix metering mode.
- \value MeteringAverage Center weighted average metering mode.
- \value MeteringSpot Spot metering mode.
-*/
-
-/*!
\property QCameraExposure::flashReady
\brief Indicates if the flash is charged and ready to use.
*/
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index a1dc96701..f4522d8c7 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -59,11 +59,9 @@ class Q_MULTIMEDIA_EXPORT QCameraExposure : public QObject
Q_PROPERTY(bool flashReady READ isFlashReady NOTIFY flashReady)
Q_PROPERTY(QCameraExposure::FlashModes flashMode READ flashMode WRITE setFlashMode)
Q_PROPERTY(QCameraExposure::ExposureMode exposureMode READ exposureMode WRITE setExposureMode)
- Q_PROPERTY(QCameraExposure::MeteringMode meteringMode READ meteringMode WRITE setMeteringMode)
Q_ENUMS(FlashMode)
Q_ENUMS(ExposureMode)
- Q_ENUMS(MeteringMode)
public:
enum FlashMode {
FlashAuto = 0x1,
@@ -104,12 +102,6 @@ public:
ExposureModeVendor = 1000
};
- enum MeteringMode {
- MeteringMatrix = 1,
- MeteringAverage = 2,
- MeteringSpot = 3
- };
-
bool isAvailable() const;
FlashModes flashMode() const;
@@ -121,12 +113,6 @@ public:
qreal exposureCompensation() const;
- MeteringMode meteringMode() const;
- bool isMeteringModeSupported(MeteringMode mode) const;
-
- QPointF spotMeteringPoint() const;
- void setSpotMeteringPoint(const QPointF &point);
-
int isoSensitivity() const;
qreal aperture() const;
qreal shutterSpeed() const;
@@ -142,7 +128,6 @@ public:
public Q_SLOTS:
void setFlashMode(FlashModes mode);
void setExposureMode(ExposureMode mode);
- void setMeteringMode(MeteringMode mode);
void setExposureCompensation(qreal ev);
@@ -186,10 +171,8 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QCameraExposure::ExposureMode)
Q_DECLARE_METATYPE(QCameraExposure::FlashModes)
-Q_DECLARE_METATYPE(QCameraExposure::MeteringMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
-Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
#endif // QCAMERAEXPOSURE_H
diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp
index 2095c9cfa..06ccb496f 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.cpp
+++ b/src/multimedia/controls/qcameraexposurecontrol.cpp
@@ -117,13 +117,8 @@ QCameraExposureControl::~QCameraExposureControl()
This value is only used in the \l{QCameraExposure::FlashTorch}{torch flash mode}.
\value FlashCompensation
Flash compensation, specified as qreal EV value.
- \value SpotMeteringPoint
- The relative frame coordinate of the point to use for exposure metering
- in spot metering mode, specified as a QPointF.
\value ExposureMode
Camera exposure mode.
- \value MeteringMode
- Camera metering mode.
\value ExtendedExposureParameter
The base value for platform specific extended parameters.
For such parameters the sequential values starting from ExtendedExposureParameter should be used.
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index 7694380e5..563ee6f92 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -68,9 +68,7 @@ public:
FlashPower,
FlashCompensation,
TorchPower,
- SpotMeteringPoint,
ExposureMode,
- MeteringMode,
ExtendedExposureParameter = 1000
};
diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp
index 0b2343443..5607bd5d2 100644
--- a/src/multimedia/qmediametadata.cpp
+++ b/src/multimedia/qmediametadata.cpp
@@ -133,7 +133,6 @@ Q_DEFINE_METADATA(ExposureBiasValue);
Q_DEFINE_METADATA(DateTimeOriginal);
Q_DEFINE_METADATA(DateTimeDigitized);
Q_DEFINE_METADATA(SubjectDistance);
-Q_DEFINE_METADATA(MeteringMode);
Q_DEFINE_METADATA(LightSource);
Q_DEFINE_METADATA(Flash);
Q_DEFINE_METADATA(FocalLength);
@@ -275,7 +274,6 @@ Q_DEFINE_METADATA(ThumbnailImage);
\row \li DateTimeOriginal \li The date and time when the original image data was generated. \li QDateTime
\row \li DateTimeDigitized \li The date and time when the image was stored as digital data. \li QDateTime
\row \li SubjectDistance \li The distance to the subject, given in meters. \li qreal
- \row \li MeteringMode \li The metering mode. \li QCameraExposure::MeteringMode
\row \li LightSource
\li The kind of light source. \li QString
\row \li Flash
diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h
index 8d8744490..bea76b8a5 100644
--- a/src/multimedia/qmediametadata.h
+++ b/src/multimedia/qmediametadata.h
@@ -131,7 +131,6 @@ namespace QMediaMetaData {
QString DateTimeOriginal;
QString DateTimeDigitized;
QString SubjectDistance;
- QString MeteringMode;
QString LightSource;
QString Flash;
QString FocalLength;
@@ -243,7 +242,6 @@ namespace QMediaMetaData {
Q_DECLARE_METADATA(DateTimeOriginal);
Q_DECLARE_METADATA(DateTimeDigitized);
Q_DECLARE_METADATA(SubjectDistance);
- Q_DECLARE_METADATA(MeteringMode);
Q_DECLARE_METADATA(LightSource);
Q_DECLARE_METADATA(Flash);
Q_DECLARE_METADATA(FocalLength);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 00:50:31 +0000