summaryrefslogtreecommitdiff
path: root/test/camera/configuration_set.cpp
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 /test/camera/configuration_set.cpp
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 'test/camera/configuration_set.cpp')
-rw-r--r--test/camera/configuration_set.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
index ca41ed68..24d5ca66 100644
--- a/test/camera/configuration_set.cpp
+++ b/test/camera/configuration_set.cpp
@@ -19,7 +19,7 @@ protected:
int run()
{
CameraConfiguration config =
- camera_->streamConfiguration({ Stream::VideoRecording() });
+ camera_->generateConfiguration({ Stream::VideoRecording() });
StreamConfiguration *cfg = &config[config.front()];
if (!config.isValid()) {
@@ -33,7 +33,7 @@ protected:
}
/* Test that setting the default configuration works. */
- if (camera_->configureStreams(config)) {
+ if (camera_->configure(config)) {
cout << "Failed to set default configuration" << endl;
return TestFail;
}
@@ -48,7 +48,7 @@ protected:
return TestFail;
}
- if (!camera_->configureStreams(config)) {
+ if (!camera_->configure(config)) {
cout << "Setting configuration on a camera not acquired succeeded when it should have failed"
<< endl;
return TestFail;
@@ -66,7 +66,7 @@ protected:
*/
cfg->size.width *= 2;
cfg->size.height *= 2;
- if (camera_->configureStreams(config)) {
+ if (camera_->configure(config)) {
cout << "Failed to set modified configuration" << endl;
return TestFail;
}
@@ -75,7 +75,7 @@ protected:
* Test that setting an invalid configuration fails.
*/
cfg->size = { 0, 0 };
- if (!camera_->configureStreams(config)) {
+ if (!camera_->configure(config)) {
cout << "Invalid configuration incorrectly accepted" << endl;
return TestFail;
}