From f1ab117e81e55b9b030dd921394dde294f7c3dc0 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 28 Sep 2019 14:13:44 +0300
Subject: libcamera: controls: Remove ControlInfo::id
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/libcamera/controls.cpp | 13 +++----------
src/libcamera/pipeline/uvcvideo.cpp | 2 +-
src/libcamera/pipeline/vimc.cpp | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
(limited to 'src')
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,22 +323,15 @@ 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
@@ -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;
--
cgit v1.2.1