From dac8e9552ccdff137e717270468e584c2a9895b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Tue, 11 Aug 2020 00:56:13 +0200 Subject: libcamera: request: Declare a using directive for map of buffers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Declare a using directive for the map of Stream to FrameBuffer. Update all users of Request::buffers() to use the new usage directive. Signed-off-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- include/libcamera/request.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/libcamera/request.h b/include/libcamera/request.h index eded6831..e74f56a7 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -31,6 +31,8 @@ public: RequestCancelled, }; + using BufferMap = std::map; + Request(Camera *camera, uint64_t cookie = 0); Request(const Request &) = delete; Request &operator=(const Request &) = delete; @@ -38,7 +40,7 @@ public: ControlList &controls() { return *controls_; } ControlList &metadata() { return *metadata_; } - const std::map &buffers() const { return bufferMap_; } + const BufferMap &buffers() const { return bufferMap_; } int addBuffer(Stream *stream, FrameBuffer *buffer); FrameBuffer *findBuffer(Stream *stream) const; @@ -58,7 +60,7 @@ private: CameraControlValidator *validator_; ControlList *controls_; ControlList *metadata_; - std::map bufferMap_; + BufferMap bufferMap_; std::unordered_set pending_; const uint64_t cookie_; -- cgit v1.2.1