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

6
src/plugins/simulator/camera/simulatorcameracontrol.cpp
View File

@@ -55,12 +55,12 @@ SimulatorCameraControl::~SimulatorCameraControl()
{
}
QCamera::CaptureMode SimulatorCameraControl::captureMode() const
QCamera::CaptureModes SimulatorCameraControl::captureMode() const
{
return m_session->captureMode();
}
void SimulatorCameraControl::setCaptureMode(QCamera::CaptureMode mode)
void SimulatorCameraControl::setCaptureMode(QCamera::CaptureModes mode)
{
if (m_session->captureMode() != mode) {
m_session->setCaptureMode(mode);
@@ -168,7 +168,7 @@ bool SimulatorCameraControl::canChangeProperty(PropertyChangeType changeType, QC
}
}
bool SimulatorCameraControl::isCaptureModeSupported(QCamera::CaptureMode mode) const
bool SimulatorCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const
{
return mode == QCamera::CaptureStillImage;
}

6
src/plugins/simulator/camera/simulatorcameracontrol.h
View File

@@ -64,10 +64,10 @@ public:
QCamera::Status status() const;
QCamera::CaptureMode captureMode() const;
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode() const;
void setCaptureMode(QCamera::CaptureModes mode);
bool isCaptureModeSupported(QCamera::CaptureMode mode) const;
bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const;

6
src/plugins/simulator/camera/simulatorcamerasession.cpp
View File

@@ -86,12 +86,12 @@ int SimulatorCameraSession::captureImage(const QString &fileName)
return mRequestId;
}
void SimulatorCameraSession::setCaptureMode(QCamera::CaptureMode mode)
void SimulatorCameraSession::setCaptureMode(QCamera::CaptureModes mode)
{
mCaptureMode = mode;
}
QDir SimulatorCameraSession::defaultDir(QCamera::CaptureMode) const
QDir SimulatorCameraSession::defaultDir(QCamera::CaptureModes) const
{
const QString temp = QDir::tempPath();
if (QFileInfo(temp).isWritable())
@@ -126,7 +126,7 @@ void SimulatorCameraSession::setViewfinder(QObject *viewfinder)
}
}
QCamera::CaptureMode SimulatorCameraSession::captureMode()
QCamera::CaptureModes SimulatorCameraSession::captureMode()
{
return mCaptureMode;
}

8
src/plugins/simulator/camera/simulatorcamerasession.h
View File

@@ -58,10 +58,10 @@ public:
SimulatorCameraSession(QObject *parent);
~SimulatorCameraSession();
QCamera::CaptureMode captureMode();
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode();
void setCaptureMode(QCamera::CaptureModes mode);
QDir defaultDir(QCamera::CaptureMode mode) const;
QDir defaultDir(QCamera::CaptureModes mode) const;
QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
void setImage(const QImage *image);
@@ -82,7 +82,7 @@ signals:
void viewfinderChanged();
private:
QCamera::CaptureMode mCaptureMode;
QCamera::CaptureModes mCaptureMode;
QObject *mViewfinder;
const QImage *mImage;