NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: controls: Remove ControlInfo::id

Browse source 
The ControlInfo id member is only used in the toString() method of the
class, and nowhere else externally. The same way that ControlValue
doesn't store a ControlId, ControlInfo shouldn't. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-09-28 14:13:44 +03:00
parent 5a952df386
commit f1ab117e81
5 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/controls/control_info.cpp
View file

@ -24,14 +24,7 @@ protected:
* Test information retrieval from a control with no minimum
* and maximum.
*/
ControlInfo brightness(controls::Brightness);
if (brightness.id() != controls::Brightness ||
brightness.id().type() != ControlTypeInteger32 ||
brightness.id().name() != std::string("Brightness")) {
cout << "Invalid control identification for Brightness" << endl;
return TestFail;
}
ControlInfo brightness;
if (brightness.min().get<int32_t>() != 0 ||
brightness.max().get<int32_t>() != 0) {
@ -43,14 +36,7 @@ protected:
* Test information retrieval from a control with a minimum and
* a maximum value.
*/
ControlInfo contrast(controls::Contrast, 10, 200);
if (contrast.id() != controls::Contrast ||
contrast.id().type() != ControlTypeInteger32 ||
contrast.id().name() != std::string("Contrast")) {
cout << "Invalid control identification for Contrast" << endl;
return TestFail;
}
ControlInfo contrast(10, 200);
if (contrast.min().get<int32_t>() != 10 ||
contrast.max().get<int32_t>() != 200) {