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/pipeline/vimc.cpp | |
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/pipeline/vimc.cpp')
-rw-r--r-- | src/libcamera/pipeline/vimc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 737d6df6..74959581 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -26,10 +26,10 @@ public: PipelineHandlerVimc(CameraManager *manager); CameraConfiguration - streamConfiguration(Camera *camera, - const std::vector<StreamUsage> &usages) override; - int configureStreams(Camera *camera, - const CameraConfiguration &config) override; + generateConfiguration(Camera *camera, + const std::vector<StreamUsage> &usages) override; + int configure(Camera *camera, + const CameraConfiguration &config) override; int allocateBuffers(Camera *camera, const std::set<Stream *> &streams) override; @@ -76,8 +76,8 @@ PipelineHandlerVimc::PipelineHandlerVimc(CameraManager *manager) } CameraConfiguration -PipelineHandlerVimc::streamConfiguration(Camera *camera, - const std::vector<StreamUsage> &usages) +PipelineHandlerVimc::generateConfiguration(Camera *camera, + const std::vector<StreamUsage> &usages) { VimcCameraData *data = cameraData(camera); CameraConfiguration config; @@ -92,8 +92,8 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera, return config; } -int PipelineHandlerVimc::configureStreams(Camera *camera, - const CameraConfiguration &config) +int PipelineHandlerVimc::configure(Camera *camera, + const CameraConfiguration &config) { VimcCameraData *data = cameraData(camera); const StreamConfiguration *cfg = &config[&data->stream_]; |