From beba964dc412de78fad8fb0e3a9c8a20ff3c0399 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 10 Feb 2015 11:44:58 +0100 Subject: Clarify documentation for QImageCapture's 'ready' property. Unlike what was described in the documentation, it's not permissible to call capture() while 'ready' or isReadyForCapture() is false. All backends emit an error in that case. Updated the documentation to reflect that behavior. Change-Id: Icb326e65376b65eadd4c68b67e0ee30beddf1a04 Reviewed-by: Venugopal Shivashankar Reviewed-by: Christian Stromme --- src/imports/multimedia/qdeclarativecameracapture.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/imports') diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index ad90d976e..79121a28c 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -123,9 +123,8 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture() This property holds a bool value indicating whether the camera is ready to capture photos or not. - If camera is not ready to capture image immediately, - the capture request is queued with all the related camera settings, - and the request will be executed as soon as possible. + Calling capture() while \e ready is \c false is not permitted and + results in an error. */ /*! @@ -134,11 +133,8 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture() This property holds a bool value indicating whether the camera is ready to capture photos or not. - It's permissible to call capture() while the camera is active - regardless of the \e ready property value. - If camera is not ready to capture image immediately, - the capture request is queued with all the related camera settings, - and the request will be executed as soon as possible. + Calling capture() while \e ready is \c false is not permitted and + results in an error. */ bool QDeclarativeCameraCapture::isReadyForCapture() const { @@ -160,8 +156,10 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const image processing parameters, so changes to camera paramaters after capture() is called do not affect previous capture requests. - CameraCapture::capture returns the capture requestId parameter, used with + capture() returns the capture requestId parameter, used with imageExposed(), imageCaptured(), imageMetadataAvailable() and imageSaved() signals. + + \sa ready */ int QDeclarativeCameraCapture::capture() { -- cgit v1.2.1 From 4ce9d89d7a315100393aeae9998a8f9e838650ca Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 11 Feb 2015 10:05:21 +0100 Subject: Fix some typos Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes --- src/imports/audioengine/qdeclarative_audiosample_p.cpp | 8 ++++---- src/imports/audioengine/qdeclarative_sound_p.cpp | 8 ++++---- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- src/imports/multimedia/qdeclarativecameracapture.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/imports') diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp index 29c4ffe7e..69ec8a2bb 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp @@ -114,7 +114,7 @@ QUrl QDeclarativeAudioSample::source() const void QDeclarativeAudioSample::setSource(const QUrl& url) { if (m_complete) { - qWarning("AudioSample: source not changable after initialization."); + qWarning("AudioSample: source not changeable after initialization."); return; } m_url = url; @@ -170,7 +170,7 @@ void QDeclarativeAudioSample::load() void QDeclarativeAudioSample::setPreloaded(bool preloaded) { if (m_complete) { - qWarning("AudioSample: preloaded not changable after initialization."); + qWarning("AudioSample: preloaded not changeable after initialization."); return; } m_preloaded = preloaded; @@ -179,7 +179,7 @@ void QDeclarativeAudioSample::setPreloaded(bool preloaded) void QDeclarativeAudioSample::setStreaming(bool streaming) { if (m_complete) { - qWarning("AudioSample: streaming not changable after initialization."); + qWarning("AudioSample: streaming not changeable after initialization."); return; } m_streaming = streaming; @@ -199,7 +199,7 @@ QString QDeclarativeAudioSample::name() const void QDeclarativeAudioSample::setName(const QString& name) { if (m_complete) { - qWarning("AudioSample: name not changable after initialization."); + qWarning("AudioSample: name not changeable after initialization."); return; } m_name = name; diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp index 6286e9e7f..c55f702d5 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.cpp +++ b/src/imports/audioengine/qdeclarative_sound_p.cpp @@ -239,7 +239,7 @@ QDeclarativeSound::PlayType QDeclarativeSound::playType() const void QDeclarativeSound::setPlayType(PlayType playType) { if (m_complete) { - qWarning("Sound: playType not changable after initialization."); + qWarning("Sound: playType not changeable after initialization."); return; } m_playType = playType; @@ -258,7 +258,7 @@ QString QDeclarativeSound::category() const void QDeclarativeSound::setCategory(const QString& category) { if (m_complete) { - qWarning("Sound: category not changable after initialization."); + qWarning("Sound: category not changeable after initialization."); return; } m_category = category; @@ -278,7 +278,7 @@ QString QDeclarativeSound::name() const void QDeclarativeSound::setName(const QString& name) { if (m_complete) { - qWarning("Sound: category not changable after initialization."); + qWarning("Sound: category not changeable after initialization."); return; } m_name = name; @@ -322,7 +322,7 @@ QDeclarativePlayVariation* QDeclarativeSound::getVariation(int index) void QDeclarativeSound::setAttenuationModel(QString attenuationModel) { if (m_complete) { - qWarning("Sound: attenuationModel not changable after initialization."); + qWarning("Sound: attenuationModel not changeable after initialization."); return; } m_attenuationModel = attenuationModel; diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 61ac518c7..c911c5e02 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -925,7 +925,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) \qmlproperty variant QtMultimedia::Camera::metaData.gpsLongitude \qmlproperty variant QtMultimedia::Camera::metaData.gpsAltitude - These properties hold the the geographic position in decimal degrees of the + These properties hold the geographic position in decimal degrees of the camera at time of capture. \sa {QMediaMetaData} diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index 79121a28c..f70429c9c 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -153,7 +153,7 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const for video. Camera saves all the capture parameters like exposure settings or - image processing parameters, so changes to camera paramaters after + image processing parameters, so changes to camera parameters after capture() is called do not affect previous capture requests. capture() returns the capture requestId parameter, used with -- cgit v1.2.1