From patchwork Wed Jan 22 20:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2719 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CD37C60871 for ; Wed, 22 Jan 2020 21:57:43 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 77BC72F9 for ; Wed, 22 Jan 2020 21:57:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1579726663; bh=yyjEI7pQLc+6xITewJUfAh0GuwQzH3yxmc44qDBtIc8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=vGVXP2VkSYmyUKGfVLOeU1+hhFh9jS7u8S381/CSQs72HYca8wDFdYhFAr5BbipEY 3x4+KYtUEoI3MafGjLY9r2NXobTtmpOF7mj+w84n1WPYP1TMyGpKyfZiJ26chKdjMj Ur/pKZx68QOLj6z5zBvGl6ChvS6pofrcMX0QdSZM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 22 Jan 2020 22:57:13 +0200 Message-Id: <20200122205723.8865-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122205723.8865-1-laurent.pinchart@ideasonboard.com> References: <20200122205723.8865-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 03/13] libcamera: camera_manager: Return a copy of the vector from cameras() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 20:57:44 -0000 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 Reviewed-by: Niklas Söderlund --- include/libcamera/camera_manager.h | 2 +- src/libcamera/camera_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 068afd58762f..079f848aec79 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -30,7 +30,7 @@ public: int start(); void stop(); - const std::vector> &cameras() const; + std::vector> cameras() const; std::shared_ptr get(const std::string &name); std::shared_ptr get(dev_t devnum); diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index e0a07ec557d3..5fc1bba974c6 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -244,7 +244,7 @@ void CameraManager::stop() * * \return List of all available cameras */ -const std::vector> &CameraManager::cameras() const +std::vector> CameraManager::cameras() const { return p_->cameras_; }