From 7dab1fa58fb77ace2742dadf860d91f29474225f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 6 Jul 2021 07:49:15 +0300 Subject: cam: Make camera-related options sub-options of OptCamera Use the new hierarchical options feature of the option parser to turn camera-related option (--capture, --file, --stream, --strict-formats and --metadata) into children of the --camera option. As an added bonus, we don't need to check anymore if a camera has been specified when capture is requested, as that's now enforced by the option parser. This change prepares for support of multiple cameras. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/cam/camera_session.h') diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h index 6221aada..b3136383 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -27,10 +28,12 @@ class CameraSession { public: CameraSession(libcamera::CameraManager *cm, + const std::string &cameraId, const OptionsParser::Options &options); ~CameraSession(); bool isValid() const { return config_ != nullptr; } + const OptionsParser::Options &options() { return options_; } libcamera::Camera *camera() { return camera_.get(); } libcamera::CameraConfiguration *config() { return config_.get(); } @@ -39,7 +42,7 @@ public: void listProperties() const; void infoConfiguration() const; - int start(const OptionsParser::Options &options); + int start(); void stop(); libcamera::Signal<> captureDone; @@ -51,6 +54,7 @@ private: void requestComplete(libcamera::Request *request); void processRequest(libcamera::Request *request); + const OptionsParser::Options &options_; std::shared_ptr camera_; std::unique_ptr config_; -- cgit v1.2.1