projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged QtCamCaf and QtCamAutoFocus
[harmattan/cameraplus]
/
lib
/
qtcamautofocus.cpp
diff --git
a/lib/qtcamautofocus.cpp
b/lib/qtcamautofocus.cpp
index
b1cdf53
..
c91c1fc
100644
(file)
--- a/
lib/qtcamautofocus.cpp
+++ b/
lib/qtcamautofocus.cpp
@@
-35,10
+35,14
@@
QtCamAutoFocus::Status QtCamAutoFocus::status() {
return d_ptr->status;
}
return d_ptr->status;
}
-bool QtCamAutoFocus::start() {
+QtCamAutoFocus::Status QtCamAutoFocus::cafStatus() {
+ return d_ptr->cafStatus;
+}
+
+bool QtCamAutoFocus::startAutoFocus() {
return d_ptr->setEnabled(true);
}
return d_ptr->setEnabled(true);
}
-bool QtCamAutoFocus::stop() {
+bool QtCamAutoFocus::stop
AutoFocus
() {
return d_ptr->setEnabled(false);
}
return d_ptr->setEnabled(false);
}