summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/controls.cpp13
-rw-r--r--src/libcamera/pipeline/uvcvideo.cpp2
-rw-r--r--src/libcamera/pipeline/vimc.cpp2
3 files changed, 5 insertions, 12 deletions
diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index 5e8b3a9b..526b7755 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -323,23 +323,16 @@ Control<int64_t>::Control(unsigned int id, const char *name)
/**
* \brief Construct a ControlInfo with minimum and maximum range parameters
- * \param[in] id The control ID
* \param[in] min The control minimum value
* \param[in] max The control maximum value
*/
-ControlInfo::ControlInfo(const ControlId &id, const ControlValue &min,
+ControlInfo::ControlInfo(const ControlValue &min,
const ControlValue &max)
- : id_(id), min_(min), max_(max)
+ : min_(min), max_(max)
{
}
/**
- * \fn ControlInfo::id()
- * \brief Retrieve the control ID
- * \return The control ID
- */
-
-/**
* \fn ControlInfo::min()
* \brief Retrieve the minimum value of the control
* \return A ControlValue with the minimum value for the control
@@ -358,7 +351,7 @@ std::string ControlInfo::toString() const
{
std::stringstream ss;
- ss << id_.name() << "[" << min_.toString() << ".." << max_.toString() << "]";
+ ss << "[" << min_.toString() << ".." << max_.toString() << "]";
return ss.str();
}
diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp
index d5d30932..2ac582d7 100644
--- a/src/libcamera/pipeline/uvcvideo.cpp
+++ b/src/libcamera/pipeline/uvcvideo.cpp
@@ -364,7 +364,7 @@ int UVCCameraData::init(MediaEntity *entity)
controlInfo_.emplace(std::piecewise_construct,
std::forward_as_tuple(id),
- std::forward_as_tuple(*id, info.min(), info.max()));
+ std::forward_as_tuple(info.min(), info.max()));
}
return 0;
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index 608a47ae..ec9c1cd2 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -437,7 +437,7 @@ int VimcCameraData::init(MediaDevice *media)
controlInfo_.emplace(std::piecewise_construct,
std::forward_as_tuple(id),
- std::forward_as_tuple(*id, info.min(), info.max()));
+ std::forward_as_tuple(info.min(), info.max()));
}
return 0;