slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed QCamera::captureMode property to QFlags

Browse Source 
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.

Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-12 16:27:34 +10:00
committed by Qt by Nokia
parent a6268601c9
commit 53d71baed3
22 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -134,7 +134,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) :
m_focus = new QDeclarativeCameraFocus(m_camera, this);
m_imageProcessing = new QDeclarativeCameraImageProcessing(m_camera, this);
connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureMode)), this, SIGNAL(captureModeChanged()));
connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureModes)), this, SIGNAL(captureModeChanged()));
connect(m_camera, SIGNAL(lockStatusChanged(QCamera::LockStatus,QCamera::LockChangeReason)), this, SIGNAL(lockStatusChanged()));
connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State)));
@@ -179,14 +179,14 @@ QString QDeclarativeCamera::errorString() const
return m_camera->errorString();
}
QDeclarativeCamera::CaptureMode QDeclarativeCamera::captureMode() const
QDeclarativeCamera::CaptureModes QDeclarativeCamera::captureMode() const
{
return QDeclarativeCamera::CaptureMode(m_camera->captureMode());
return QDeclarativeCamera::CaptureModes(int(m_camera->captureMode()));
}
void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode)
void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureModes mode)
{
m_camera->setCaptureMode(QCamera::CaptureMode(mode));
m_camera->setCaptureMode(QCamera::CaptureModes(int(mode)));
}

7
src/imports/multimedia/qdeclarativecamera_p.h
View File

@@ -79,7 +79,7 @@ class QDeclarativeCamera : public QObject, public QDeclarativeParserStatus
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
Q_PROPERTY(CaptureModes captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged)
Q_PROPERTY(LockStatus lockStatus READ lockStatus NOTIFY lockStatusChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
@@ -114,6 +114,7 @@ public:
CaptureStillImage = QCamera::CaptureStillImage,
CaptureVideo = QCamera::CaptureVideo
};
Q_DECLARE_FLAGS(CaptureModes, CaptureMode)
enum State
{
@@ -207,7 +208,7 @@ public:
QDeclarativeCameraFocus *focus() { return m_focus; }
QDeclarativeCameraImageProcessing *imageProcessing() { return m_imageProcessing; }
CaptureMode captureMode() const;
CaptureModes captureMode() const;
State cameraState() const;
Error error() const;
@@ -222,7 +223,7 @@ public:
qreal digitalZoom() const;
public Q_SLOTS:
void setCaptureMode(CaptureMode mode);
void setCaptureMode(QDeclarativeCamera::CaptureModes mode);
void start();
void stop();