projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog for 0.0.8
[harmattan/cameraplus]
/
declarative
/
camera.cpp
diff --git
a/declarative/camera.cpp
b/declarative/camera.cpp
index
5d22fd9
..
3429832
100644
(file)
--- a/
declarative/camera.cpp
+++ b/
declarative/camera.cpp
@@
-24,13
+24,15
@@
#include "qtcammode.h"
#include "qtcamimagemode.h"
#include "qtcamvideomode.h"
#include "qtcammode.h"
#include "qtcamimagemode.h"
#include "qtcamvideomode.h"
-#include "qtcamgraphicsviewfinder.h"
#include "qtcamconfig.h"
#include "sounds.h"
#include "notificationscontainer.h"
#include "sounds.h"
#include "qtcamconfig.h"
#include "sounds.h"
#include "notificationscontainer.h"
#include "sounds.h"
+#if defined(QT4)
#include <QDeclarativeInfo>
#include <QDeclarativeInfo>
-
+#elif defined(QT5)
+#include <QQmlInfo>
+#endif
#include "zoom.h"
#include "flash.h"
#include "scene.h"
#include "zoom.h"
#include "flash.h"
#include "scene.h"
@@
-49,9
+51,10
@@
#include "videomute.h"
#include "videotorch.h"
#include "cameraconfig.h"
#include "videomute.h"
#include "videotorch.h"
#include "cameraconfig.h"
+#include "quirks.h"
-Camera::Camera(Q
DeclarativeItem
*parent) :
- Q
DeclarativeItem
(parent),
+Camera::Camera(Q
Object
*parent) :
+ Q
Object
(parent),
m_cam(new QtCamera(this)),
m_dev(0),
m_mode(Camera::UnknownMode),
m_cam(new QtCamera(this)),
m_dev(0),
m_mode(Camera::UnknownMode),
@@
-72,7
+75,8
@@
Camera::Camera(QDeclarativeItem *parent) :
m_roi(0),
m_videoMute(0),
m_videoTorch(0),
m_roi(0),
m_videoMute(0),
m_videoTorch(0),
- m_config(new CameraConfig(this)) {
+ m_config(new CameraConfig(this)),
+ m_quirks(0) {
m_config->componentComplete();
}
m_config->componentComplete();
}
@@
-104,12
+108,7
@@
Camera::~Camera() {
delete m_roi;
delete m_videoMute;
delete m_videoTorch;
delete m_roi;
delete m_videoMute;
delete m_videoTorch;
-}
-
-void Camera::componentComplete() {
- QDeclarativeItem::componentComplete();
-
- emit deviceCountChanged();
+ delete m_quirks;
}
int Camera::deviceCount() const {
}
int Camera::deviceCount() const {
@@
-130,11
+129,6
@@
bool Camera::reset(const QVariant& deviceId, const CameraMode& mode) {
return false;
}
return false;
}
- if (!isComponentComplete()) {
- qmlInfo(this) << "Component is still not ready";
- return false;
- }
-
QVariant oldId = m_id;
Camera::CameraMode oldMode = m_mode;
QVariant oldId = m_id;
Camera::CameraMode oldMode = m_mode;
@@
-162,6
+156,7
@@
bool Camera::setDeviceId(const QVariant& deviceId) {
}
if (m_dev && m_dev->stop(false)) {
}
if (m_dev && m_dev->stop(false)) {
+ emit prepareForDeviceChange();
delete m_dev;
}
else if (m_dev) {
delete m_dev;
}
else if (m_dev) {
@@
-188,10
+183,6
@@
QVariant Camera::deviceId() const {
return m_id;
}
return m_id;
}
-void Camera::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) {
- QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
-}
-
QtCamDevice *Camera::device() const {
return m_dev;
}
QtCamDevice *Camera::device() const {
return m_dev;
}
@@
-345,6
+336,10
@@
void Camera::resetCapabilities() {
delete m_videoTorch;
m_videoTorch = new VideoTorch(dev, this);
emit videoTorchChanged();
delete m_videoTorch;
m_videoTorch = new VideoTorch(dev, this);
emit videoTorchChanged();
+
+ delete m_quirks;
+ m_quirks = new Quirks(dev->config()->quirks(dev->id()), this);
+ emit quirksChanged();
}
Zoom *Camera::zoom() const {
}
Zoom *Camera::zoom() const {
@@
-414,3
+409,7
@@
VideoTorch *Camera::videoTorch() const {
CameraConfig *Camera::cameraConfig() const {
return m_config;
}
CameraConfig *Camera::cameraConfig() const {
return m_config;
}
+
+Quirks *Camera::quirks() const {
+ return m_quirks;
+}