projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
populate post capture model when page is current and clear it when we leave
[harmattan/cameraplus]
/
lib
/
qtcamimagemode.cpp
diff --git
a/lib/qtcamimagemode.cpp
b/lib/qtcamimagemode.cpp
index
8a913e5
..
6aae13b
100644
(file)
--- a/
lib/qtcamimagemode.cpp
+++ b/
lib/qtcamimagemode.cpp
@@
-1,7
+1,7
@@
/*!
* This file is part of CameraPlus.
*
/*!
* This file is part of CameraPlus.
*
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012
-2013
Mohammed Sameer <msameer@foolab.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-42,7
+42,9
@@
public:
};
QtCamImageMode::QtCamImageMode(QtCamDevicePrivate *dev, QObject *parent) :
};
QtCamImageMode::QtCamImageMode(QtCamDevicePrivate *dev, QObject *parent) :
- QtCamMode(new QtCamImageModePrivate(dev), "mode-image", "image-done", parent) {
+ QtCamMode(new QtCamImageModePrivate(dev), "mode-image", parent) {
+
+ d_ptr->init(new DoneHandler(d_ptr, "image-done", this));
d = (QtCamImageModePrivate *)d_ptr;
d = (QtCamImageModePrivate *)d_ptr;
@@
-62,7
+64,7
@@
QtCamImageMode::~QtCamImageMode() {
}
bool QtCamImageMode::canCapture() {
}
bool QtCamImageMode::canCapture() {
- return QtCamMode::canCapture() && d_ptr->dev->is
WrapperReady
();
+ return QtCamMode::canCapture() && d_ptr->dev->is
ReadyForCapture
();
}
void QtCamImageMode::applySettings() {
}
void QtCamImageMode::applySettings() {
@@
-86,7
+88,7
@@
void QtCamImageMode::applySettings() {
}
void QtCamImageMode::start() {
}
void QtCamImageMode::start() {
- // Nothing
+ d_ptr->enableViewfinderFilters();
}
void QtCamImageMode::stop() {
}
void QtCamImageMode::stop() {
@@
-141,3
+143,7
@@
void QtCamImageMode::setProfile(GstEncodingProfile *profile) {
QtCamImageSettings *QtCamImageMode::settings() const {
return d->settings;
}
QtCamImageSettings *QtCamImageMode::settings() const {
return d->settings;
}
+
+QtCamImageResolution QtCamImageMode::currentResolution() {
+ return d->resolution;
+}