diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 2ae4ec3d..32fb31f7 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -334,8 +333,6 @@ public: const ControlValue &def = {}); explicit ControlInfo(Span values, const ControlValue &def = {}); - explicit ControlInfo(std::set values, bool def); - explicit ControlInfo(bool value); const ControlValue &min() const { return min_; } const ControlValue &max() const { return max_; } diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 98fa7583..1e1b49e6 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -625,35 +625,6 @@ ControlInfo::ControlInfo(Span values, values_.push_back(value); } -/** - * \brief Construct a boolean ControlInfo with both boolean values - * \param[in] values The control valid boolean values (both true and false) - * \param[in] def The control default boolean value - * - * Construct a ControlInfo for a boolean control, where both true and false are - * valid values. \a values must be { false, true } (the order is irrelevant). - * The minimum value will always be false, and the maximum always true. The - * default value is \a def. - */ -ControlInfo::ControlInfo(std::set values, bool def) - : min_(false), max_(true), def_(def), values_({ false, true }) -{ - ASSERT(values.count(def) && values.size() == 2); -} - -/** - * \brief Construct a boolean ControlInfo with only one valid value - * \param[in] value The control valid boolean value - * - * Construct a ControlInfo for a boolean control, where there is only valid - * value. The minimum, maximum, and default values will all be \a value. - */ -ControlInfo::ControlInfo(bool value) - : min_(value), max_(value), def_(value) -{ - values_ = { value }; -} - /** * \fn ControlInfo::min() * \brief Retrieve the minimum value of the control diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp index e1bb43f0..905d92dd 100644 --- a/test/controls/control_info.cpp +++ b/test/controls/control_info.cpp @@ -50,7 +50,7 @@ protected: * Test information retrieval from a control with boolean * values. */ - ControlInfo aeEnable({ false, true }, false); + ControlInfo aeEnable(false, true, false); if (aeEnable.min().get() != false || aeEnable.def().get() != false || @@ -59,13 +59,12 @@ protected: return TestFail; } - if (aeEnable.values()[0].get() != false || - aeEnable.values()[1].get() != true) { + if (!aeEnable.values().empty()) { cout << "Invalid control values for AeEnable" << endl; return TestFail; } - ControlInfo awbEnable(true); + ControlInfo awbEnable(true, true, true); if (awbEnable.min().get() != true || awbEnable.def().get() != true || @@ -74,7 +73,7 @@ protected: return TestFail; } - if (awbEnable.values()[0].get() != true) { + if (!awbEnable.values().empty()) { cout << "Invalid control values for AwbEnable" << endl; return TestFail; }