diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-12-12 12:00:06 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-13 13:34:41 +0100 |
| commit | fe21ee675e72f7cb3936db6aa01862cfd322ce50 (patch) | |
| tree | 8d2caa1d13b79cff554a7fbb8b98051c0695d683 /src/imports/multimedia/qdeclarativecameraviewfinder_p.h | |
| parent | c31d8cddd0a2e1f1ee622bc9ea07d038191ceea2 (diff) | |
New camera viewfinder settings API.
There already was a control interface for the viewfinder settings
but no real public C++ API and a partial QML API.
This patch adds a new C++ API and improves the QML API.
Supported viewfinder settings are resolution, minimumFrameRate,
maximumFrameRate and pixelFormat. The camera can be queried for
the supported values for each of these settings.
A new control interface was created to match the new API.
Change-Id: I289fea038fe46277a5516c956a64280da09ed985
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraviewfinder_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraviewfinder_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h index 3597ca0cc..2df03584a 100644 --- a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h +++ b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h @@ -78,9 +78,12 @@ Q_SIGNALS: void minimumFrameRateChanged(); void maximumFrameRateChanged(); +private Q_SLOTS: + void _q_cameraStatusChanged(QCamera::Status status); + private: QCamera *m_camera; - QCameraViewfinderSettingsControl *m_control; + QCameraViewfinderSettings m_settings; }; QT_END_NAMESPACE |