diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-05 02:52:59 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-09 16:59:19 +0200 |
| commit | b0c730e330281f38ac51cb64d9581ed278759048 (patch) | |
| tree | dd7398671330775d1ca302fe7871222a435eba6a /src/qcam | |
| parent | 9a7dc3ce7f4253578a0f7c0d58417425c8155cb3 (diff) | |
libcamera: Switch to CameraConfiguration
Implement the camera configuration thru out the library, tests, cam and
qcam tools.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/qcam')
| -rw-r--r-- | src/qcam/main_window.cpp | 2 | ||||
| -rw-r--r-- | src/qcam/main_window.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index faa3bc57..4bc04403 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -98,7 +98,7 @@ int MainWindow::startCapture() int ret; config_ = camera_->streamConfiguration({ Stream::VideoRecording() }); - Stream *stream = config_.begin()->first; + Stream *stream = config_.front(); ret = camera_->configureStreams(config_); if (ret < 0) { std::cout << "Failed to configure camera" << std::endl; diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 5e27a8fd..9b31da2b 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -46,7 +46,7 @@ private: std::shared_ptr<Camera> camera_; bool isCapturing_; - std::map<Stream *, StreamConfiguration> config_; + CameraConfiguration config_; ViewFinder *viewfinder_; }; |