projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved wrapperIsReady to QtCamDevicePrivate and renamed to isWrapperReady
[harmattan/cameraplus]
/
lib
/
qtcamimagemode.cpp
diff --git
a/lib/qtcamimagemode.cpp
b/lib/qtcamimagemode.cpp
index
4fddcab
..
9614a5b
100644
(file)
--- a/
lib/qtcamimagemode.cpp
+++ b/
lib/qtcamimagemode.cpp
@@
-15,17
+15,6
@@
public:
~QtCamImageModePrivate() {
}
~QtCamImageModePrivate() {
}
- bool wrapperIsReady() {
- if (!dev->wrapperVideoSource) {
- return false;
- }
-
- gboolean ready = FALSE;
- g_object_get(dev->wrapperVideoSource, "ready-for-capture", &ready, NULL);
-
- return ready == TRUE;
- }
-
QtCamImageSettings settings;
};
QtCamImageSettings settings;
};
@@
-50,7
+39,7
@@
QtCamImageMode::~QtCamImageMode() {
}
bool QtCamImageMode::canCapture() {
}
bool QtCamImageMode::canCapture() {
- return QtCamMode::canCapture() && d_ptr->
wrapperIs
Ready();
+ return QtCamMode::canCapture() && d_ptr->
dev->isWrapper
Ready();
}
void QtCamImageMode::applySettings() {
}
void QtCamImageMode::applySettings() {