diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-04-28 15:41:20 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-05-23 00:27:10 +0300 |
commit | 2ca2d658700c57c3d734d72b2148436907152257 (patch) | |
tree | fd1daddee8186b2a3324089a68607e3e020d40fc /src/libcamera/include/pipeline_handler.h | |
parent | d8de003a0482c998c178151bd1e5684fef60b8be (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 'src/libcamera/include/pipeline_handler.h')
-rw-r--r-- | src/libcamera/include/pipeline_handler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h index 9f5fe3d6..9cc11a8e 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/src/libcamera/include/pipeline_handler.h @@ -61,8 +61,8 @@ public: void unlock(); virtual CameraConfiguration - streamConfiguration(Camera *camera, const std::vector<StreamUsage> &usages) = 0; - virtual int configureStreams(Camera *camera, const CameraConfiguration &config) = 0; + generateConfiguration(Camera *camera, const std::vector<StreamUsage> &usages) = 0; + virtual int configure(Camera *camera, const CameraConfiguration &config) = 0; virtual int allocateBuffers(Camera *camera, const std::set<Stream *> &streams) = 0; |