summaryrefslogtreecommitdiff
path: root/include/libcamera/camera.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-28 15:41:20 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-23 00:27:10 +0300
commit2ca2d658700c57c3d734d72b2148436907152257 (patch)
treefd1daddee8186b2a3324089a68607e3e020d40fc /include/libcamera/camera.h
parentd8de003a0482c998c178151bd1e5684fef60b8be (diff)
libcamera: camera: Rename configureStreams() and streamConfiguration()
Rename the configureStreams() and streamConfiguration() methods to configure() and generateConfiguration() respectively in order to clarify the API. Both methods deal with CameraConfiguration objects, and are thus not limited to streams, even if a CameraConfiguration currently contains streams only. While at it, remove the qcam MainWindow::configureStreams() method that is declared but never defined or used. 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>
Diffstat (limited to 'include/libcamera/camera.h')
-rw-r--r--include/libcamera/camera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index 777b7e4d..306739b7 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -75,8 +75,8 @@ public:
const std::set<Stream *> &streams() const;
CameraConfiguration
- streamConfiguration(const std::vector<StreamUsage> &usage);
- int configureStreams(const CameraConfiguration &config);
+ generateConfiguration(const std::vector<StreamUsage> &usage);
+ int configure(const CameraConfiguration &config);
int allocateBuffers();
int freeBuffers();