diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-07-23 00:36:58 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-08-03 23:05:09 +0300 |
| commit | 86eac92fcf0c5d37c9db779008ff513c4f36d9be (patch) | |
| tree | 34b92aa46a45e099b3887d46c7b3c0831205ba19 | |
| parent | a0143dc8939829639c7c4f1e023dae93be578744 (diff) | |
libcamera: camera: Make Camera::Private members private
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
| -rw-r--r-- | include/libcamera/internal/camera.h | 10 |
1 files changed, 5 insertions, 5 deletions
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<Stream *> &streams); + ~Private(); + +private: enum State { CameraAvailable, CameraAcquired, @@ -34,10 +39,6 @@ public: CameraRunning, }; - Private(PipelineHandler *pipe, const std::string &id, - const std::set<Stream *> &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<Stream *> streams_; std::set<const Stream *> activeStreams_; -private: bool disconnected_; std::atomic<State> state_; }; |