Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-25 01:25:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: camera_manager: Return a copy of the vector from cameras()

Browse source 
Making CameraManager::cameras() thread-safe requires returning a copy of
the cameras vector instead of a reference. This is also required for
hot-plugging support and is thus desirable.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-01-22 21:25:05 +02:00
parent b6467bd9c6
commit a0295fdaf8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/camera_manager.h
View file

@ -30,7 +30,7 @@ public:
int start(); int start();
void stop(); void stop();
const std::vector<std::shared_ptr<Camera>> &cameras() const; std::vector<std::shared_ptr<Camera>> cameras() const;
std::shared_ptr<Camera> get(const std::string &name); std::shared_ptr<Camera> get(const std::string &name);
std::shared_ptr<Camera> get(dev_t devnum); std::shared_ptr<Camera> get(dev_t devnum);

2
src/libcamera/camera_manager.cpp
View file

@ -244,7 +244,7 @@ void CameraManager::stop()
* *
* \return List of all available cameras * \return List of all available cameras
*/ */
const std::vector<std::shared_ptr<Camera>> &CameraManager::cameras() const std::vector<std::shared_ptr<Camera>> CameraManager::cameras() const
{ {
return p_->cameras_; return p_->cameras_;
} }