PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: controls: Make ControlValue get/set accessors template methods

Browse Source 
The ControlValue get accessors are implemented with functions of
different names, whlie the set accessors use polymorphism to support
different control types. This isn't very consistent and intuitive. Make
the API clearer by using template methods. This will also have the added
advantage that support for the new types will only require adding
template specialisations, without adding new methods.

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 00:40:51 +03:00
parent c5dfd9d57e
commit 224ef9776a
7 changed files with 69 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/controls/control_list.cpp
+8 -8
View File
@@ -96,7 +96,7 @@ protected:
return TestFail;
}
if (list[Brightness].getInt() != 255) {
if (list[Brightness].get<int>() != 255) {
cout << "Incorrest Brightness control value" << endl;
return TestFail;
}
@@ -125,8 +125,8 @@ protected:
/*
* Test control value retrieval and update through ControlInfo.
*/
if (list[brightness].getInt() != 64 ||
list[contrast].getInt() != 128) {
if (list[brightness].get<int>() != 64 ||
list[contrast].get<int>() != 128) {
cout << "Failed to retrieve control value" << endl;
return TestFail;
}
@@ -134,8 +134,8 @@ protected:
list[brightness] = 10;
list[contrast] = 20;
if (list[brightness].getInt() != 10 ||
list[contrast].getInt() != 20) {
if (list[brightness].get<int>() != 10 ||
list[contrast].get<int>() != 20) {
cout << "Failed to update control value" << endl;
return TestFail;
}
@@ -185,9 +185,9 @@ protected:
return TestFail;
}
if (newList[Brightness].getInt() != 10 ||
newList[Contrast].getInt() != 20 ||
newList[Saturation].getInt() != 255) {
if (newList[Brightness].get<int>() != 10 ||
newList[Contrast].get<int>() != 20 ||
newList[Saturation].get<int>() != 255) {
cout << "New list contains incorrect values" << endl;
return TestFail;
}