diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
commit | d2545bd40f0a4150f616f52b9138a34c60ed2d3c (patch) | |
tree | e9e76ae976a20a22ff400a1cdd0650bf90da45b9 /src/plugins/android/src/wrappers/jcamera.h | |
parent | b0481d4b47f96b157989203bf57ec7e8ca266513 (diff) | |
parent | da89319f3859b30cf4cf03a53b50677092138921 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
Diffstat (limited to 'src/plugins/android/src/wrappers/jcamera.h')
-rw-r--r-- | src/plugins/android/src/wrappers/jcamera.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/android/src/wrappers/jcamera.h b/src/plugins/android/src/wrappers/jcamera.h index 9b2f5b177..535efe214 100644 --- a/src/plugins/android/src/wrappers/jcamera.h +++ b/src/plugins/android/src/wrappers/jcamera.h @@ -155,6 +155,7 @@ public: void takePicture(); + void fetchEachFrame(bool fetch); void fetchLastPreviewFrame(); QJNIObjectPrivate getCameraObject(); @@ -173,6 +174,7 @@ Q_SIGNALS: void pictureExposed(); void pictureCaptured(const QByteArray &data); void previewFetched(const QByteArray &preview); + void frameFetched(const QByteArray &frame); private: JCamera(int cameraId, jobject cam, QThread *workerThread); |