From 86eac92fcf0c5d37c9db779008ff513c4f36d9be Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 23 Jul 2021 00:36:58 +0300 Subject: libcamera: camera: Make Camera::Private members private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To prepare for the Camera::Private structure being used by pipeline handlers, turn all its members to private. Members that are useful for pipeline handlers will be made public again, or will be exposed through accessor functions, on a case-by-case basis. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- include/libcamera/internal/camera.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h index 9ef5d8ae..b60ed140 100644 --- a/include/libcamera/internal/camera.h +++ b/include/libcamera/internal/camera.h @@ -26,6 +26,11 @@ class Camera::Private : public Extensible::Private LIBCAMERA_DECLARE_PUBLIC(Camera) public: + Private(PipelineHandler *pipe, const std::string &id, + const std::set &streams); + ~Private(); + +private: enum State { CameraAvailable, CameraAcquired, @@ -34,10 +39,6 @@ public: CameraRunning, }; - Private(PipelineHandler *pipe, const std::string &id, - const std::set &streams); - ~Private(); - bool isRunning() const; int isAccessAllowed(State state, bool allowDisconnected = false, const char *from = __builtin_FUNCTION()) const; @@ -53,7 +54,6 @@ public: std::set streams_; std::set activeStreams_; -private: bool disconnected_; std::atomic state_; }; -- cgit v1.2.1