diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-10 13:32:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 06:14:59 +0100 |
| commit | 2db9b4b1c86cc2f8c293102518af382bc5ae92fd (patch) | |
| tree | b71b1d45859385701bf0bab1c3390d6cbc793785 /src/imports/multimedia/qdeclarativetorch.cpp | |
| parent | a9d78fbec94c80241c1f90f660cf27dc259a0df4 (diff) | |
QCameraExposure API refactoring
QCameraExposureControl:
Separated requested from actual exposure values.
Removed ParameterFlags, it's confusing and seldom used.
Moved ExposureMode and MeteringMode to parameters.
QCameraExposure:
Added requestedAperture/ShutterSpeed/Iso getters
Change-Id: I408586d85e6c9de0c8a711c32b3c90ea46052270
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativetorch.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index 1dbc1d102..6fdfc082f 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -80,7 +80,7 @@ QDeclarativeTorch::QDeclarativeTorch(QObject *parent) m_flash = service ? service->requestControl<QCameraFlashControl*>() : 0; if (m_exposure) - connect(m_exposure, SIGNAL(exposureParameterChanged(int)), SLOT(parameterChanged(int))); + connect(m_exposure, SIGNAL(valueChanged(int)), SLOT(parameterChanged(int))); // XXX There's no signal for flash mode changed } @@ -153,7 +153,7 @@ int QDeclarativeTorch::power() const if (!m_exposure) return 0; - return m_exposure->exposureParameter(QCameraExposureControl::FlashPower).toInt(); + return m_exposure->requestedValue(QCameraExposureControl::TorchPower).toInt(); } /*! @@ -166,10 +166,8 @@ void QDeclarativeTorch::setPower(int power) return; power = qBound(0, power, 100); - if (this->power() != power) { - m_exposure->setExposureParameter(QCameraExposureControl::FlashPower, power); - emit powerChanged(); - } + if (this->power() != power) + m_exposure->setValue(QCameraExposureControl::TorchPower, power); } /* Check for changes in flash power */ |