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 /test/camera/statemachine.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 'test/camera/statemachine.cpp')
| -rw-r--r-- | test/camera/statemachine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp index 8ae93bee..bd2e61ff 100644 --- a/test/camera/statemachine.cpp +++ b/test/camera/statemachine.cpp @@ -19,7 +19,7 @@ protected: int testAvailable() { /* Test operations which should fail. */ - if (camera_->configureStreams(defconf_) != -EACCES) + if (camera_->configure(defconf_) != -EACCES) return TestFail; if (camera_->allocateBuffers() != -EACCES) @@ -84,7 +84,7 @@ protected: if (camera_->acquire()) return TestFail; - if (camera_->configureStreams(defconf_)) + if (camera_->configure(defconf_)) return TestFail; return TestPass; @@ -113,7 +113,7 @@ protected: return TestFail; /* Test operations which should pass. */ - if (camera_->configureStreams(defconf_)) + if (camera_->configure(defconf_)) return TestFail; /* Test valid state transitions, end in Prepared state. */ @@ -123,7 +123,7 @@ protected: if (camera_->acquire()) return TestFail; - if (camera_->configureStreams(defconf_)) + if (camera_->configure(defconf_)) return TestFail; if (camera_->allocateBuffers()) @@ -141,7 +141,7 @@ protected: if (camera_->release() != -EBUSY) return TestFail; - if (camera_->configureStreams(defconf_) != -EACCES) + if (camera_->configure(defconf_) != -EACCES) return TestFail; if (camera_->allocateBuffers() != -EACCES) @@ -172,7 +172,7 @@ protected: if (camera_->acquire()) return TestFail; - if (camera_->configureStreams(defconf_)) + if (camera_->configure(defconf_)) return TestFail; if (camera_->allocateBuffers()) @@ -193,7 +193,7 @@ protected: if (camera_->release() != -EBUSY) return TestFail; - if (camera_->configureStreams(defconf_) != -EACCES) + if (camera_->configure(defconf_) != -EACCES) return TestFail; if (camera_->allocateBuffers() != -EACCES) @@ -235,7 +235,7 @@ protected: int run() { - defconf_ = camera_->streamConfiguration({ Stream::VideoRecording() }); + defconf_ = camera_->generateConfiguration({ Stream::VideoRecording() }); if (testAvailable() != TestPass) { cout << "State machine in Available state failed" << endl; |