diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-10-21 20:01:19 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-11-19 18:30:26 +0100 |
| commit | f7ddfd451775afd5f7c95771ce2a6b80b703836b (patch) | |
| tree | 714afe072f5e5509e35920742813c4b71128983a /src/qcam | |
| parent | 40888cfdcee71b0f8daab96a0bfdda7302be02ae (diff) | |
libcamera: camera: Remove explicit stream to buffer map in requestCompleted signal
The stream to buffer map in the requestCompleted signal is taken
directly from the request which is part of the same signal. Remove the
map as it can be fetched directly from the request.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/qcam')
| -rw-r--r-- | src/qcam/main_window.cpp | 5 | ||||
| -rw-r--r-- | src/qcam/main_window.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 3d563092..cca7365a 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -248,12 +248,13 @@ void MainWindow::stopCapture() setWindowTitle(title_); } -void MainWindow::requestComplete(Request *request, - const std::map<Stream *, Buffer *> &buffers) +void MainWindow::requestComplete(Request *request) { if (request->status() == Request::RequestCancelled) return; + const std::map<Stream *, Buffer *> &buffers = request->buffers(); + framesCaptured_++; Buffer *buffer = buffers.begin()->second; diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 30dd8743..0786e915 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -7,7 +7,6 @@ #ifndef __QCAM_MAIN_WINDOW_H__ #define __QCAM_MAIN_WINDOW_H__ -#include <map> #include <memory> #include <QElapsedTimer> @@ -49,8 +48,7 @@ private: int startCapture(); void stopCapture(); - void requestComplete(Request *request, - const std::map<Stream *, Buffer *> &buffers); + void requestComplete(Request *request); int display(Buffer *buffer); QString title_; |