[{"id":2719,"web_url":"https://patchwork.libcamera.org/comment/2719/","msgid":"<20190929085226.gwnx5ec4e6oup5ou@uno.localdomain>","date":"2019-09-29T08:52:26","subject":"Re: [libcamera-devel] [PATCH 01/12] libcamera: controls: Rename\n\tControlValueType to ControlType","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Sat, Sep 28, 2019 at 06:22:27PM +0300, Laurent Pinchart wrote:\n> The type of a control value is also the type of the control. Shorten the\n> ControlValueType enumeration to ControlType, and rename ControlValue* to\n> ControlType* for better clarity.\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  include/libcamera/controls.h   | 20 +++++++-------\n>  src/libcamera/controls.cpp     | 50 +++++++++++++++++-----------------\n>  src/libcamera/gen-controls.awk |  2 +-\n>  test/controls/control_info.cpp |  4 +--\n>  4 files changed, 38 insertions(+), 38 deletions(-)\n>\n> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> index fbb3a62274c6..ffba880a66ff 100644\n> --- a/include/libcamera/controls.h\n> +++ b/include/libcamera/controls.h\n> @@ -18,11 +18,11 @@ namespace libcamera {\n>\n>  class Camera;\n>\n> -enum ControlValueType {\n> -\tControlValueNone,\n> -\tControlValueBool,\n> -\tControlValueInteger,\n> -\tControlValueInteger64,\n> +enum ControlType {\n> +\tControlTypeNone,\n> +\tControlTypeBool,\n> +\tControlTypeInteger,\n> +\tControlTypeInteger64,\n\nI wonder if these would not be worth being ControlBool,\nControlInteger etc...\n\nIn any case\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n\n>  };\n>\n>  class ControlValue\n> @@ -33,8 +33,8 @@ public:\n>  \tControlValue(int value);\n>  \tControlValue(int64_t value);\n>\n> -\tControlValueType type() const { return type_; };\n> -\tbool isNone() const { return type_ == ControlValueNone; };\n> +\tControlType type() const { return type_; };\n> +\tbool isNone() const { return type_ == ControlTypeNone; };\n>\n>  \tvoid set(bool value);\n>  \tvoid set(int value);\n> @@ -47,7 +47,7 @@ public:\n>  \tstd::string toString() const;\n>\n>  private:\n> -\tControlValueType type_;\n> +\tControlType type_;\n>\n>  \tunion {\n>  \t\tbool bool_;\n> @@ -59,7 +59,7 @@ private:\n>  struct ControlIdentifier {\n>  \tControlId id;\n>  \tconst char *name;\n> -\tControlValueType type;\n> +\tControlType type;\n>  };\n>\n>  class ControlInfo\n> @@ -70,7 +70,7 @@ public:\n>\n>  \tControlId id() const { return ident_->id; }\n>  \tconst char *name() const { return ident_->name; }\n> -\tControlValueType type() const { return ident_->type; }\n> +\tControlType type() const { return ident_->type; }\n>\n>  \tconst ControlValue &min() const { return min_; }\n>  \tconst ControlValue &max() const { return max_; }\n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 727fdbd9450d..9960a30dfa03 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -25,16 +25,16 @@ namespace libcamera {\n>  LOG_DEFINE_CATEGORY(Controls)\n>\n>  /**\n> - * \\enum ControlValueType\n> - * \\brief Define the data type of value represented by a ControlValue\n> - * \\var ControlValueNone\n> - * Identifies an unset control value\n> - * \\var ControlValueBool\n> - * Identifies controls storing a boolean value\n> - * \\var ControlValueInteger\n> - * Identifies controls storing an integer value\n> - * \\var ControlValueInteger64\n> - * Identifies controls storing a 64-bit integer value\n> + * \\enum ControlType\n> + * \\brief Define the data type of a Control\n> + * \\var ControlTypeNone\n> + * Invalid type, for empty values\n> + * \\var ControlTypeBool\n> + * The control stores a boolean value\n> + * \\var ControlTypeInteger\n> + * The control stores an integer value\n> + * \\var ControlTypeInteger64\n> + * The control stores a 64-bit integer value\n>   */\n>\n>  /**\n> @@ -46,7 +46,7 @@ LOG_DEFINE_CATEGORY(Controls)\n>   * \\brief Construct an empty ControlValue.\n>   */\n>  ControlValue::ControlValue()\n> -\t: type_(ControlValueNone)\n> +\t: type_(ControlTypeNone)\n>  {\n>  }\n>\n> @@ -55,7 +55,7 @@ ControlValue::ControlValue()\n>   * \\param[in] value Boolean value to store\n>   */\n>  ControlValue::ControlValue(bool value)\n> -\t: type_(ControlValueBool), bool_(value)\n> +\t: type_(ControlTypeBool), bool_(value)\n>  {\n>  }\n>\n> @@ -64,7 +64,7 @@ ControlValue::ControlValue(bool value)\n>   * \\param[in] value Integer value to store\n>   */\n>  ControlValue::ControlValue(int value)\n> -\t: type_(ControlValueInteger), integer_(value)\n> +\t: type_(ControlTypeInteger), integer_(value)\n>  {\n>  }\n>\n> @@ -73,7 +73,7 @@ ControlValue::ControlValue(int value)\n>   * \\param[in] value Integer value to store\n>   */\n>  ControlValue::ControlValue(int64_t value)\n> -\t: type_(ControlValueInteger64), integer64_(value)\n> +\t: type_(ControlTypeInteger64), integer64_(value)\n>  {\n>  }\n>\n> @@ -86,7 +86,7 @@ ControlValue::ControlValue(int64_t value)\n>  /**\n>   * \\fn ControlValue::isNone()\n>   * \\brief Determine if the value is not initialised\n> - * \\return True if the value type is ControlValueNone, false otherwise\n> + * \\return True if the value type is ControlTypeNone, false otherwise\n>   */\n>\n>  /**\n> @@ -95,7 +95,7 @@ ControlValue::ControlValue(int64_t value)\n>   */\n>  void ControlValue::set(bool value)\n>  {\n> -\ttype_ = ControlValueBool;\n> +\ttype_ = ControlTypeBool;\n>  \tbool_ = value;\n>  }\n>\n> @@ -105,7 +105,7 @@ void ControlValue::set(bool value)\n>   */\n>  void ControlValue::set(int value)\n>  {\n> -\ttype_ = ControlValueInteger;\n> +\ttype_ = ControlTypeInteger;\n>  \tinteger_ = value;\n>  }\n>\n> @@ -115,7 +115,7 @@ void ControlValue::set(int value)\n>   */\n>  void ControlValue::set(int64_t value)\n>  {\n> -\ttype_ = ControlValueInteger64;\n> +\ttype_ = ControlTypeInteger64;\n>  \tinteger64_ = value;\n>  }\n>\n> @@ -128,7 +128,7 @@ void ControlValue::set(int64_t value)\n>   */\n>  bool ControlValue::getBool() const\n>  {\n> -\tASSERT(type_ == ControlValueBool);\n> +\tASSERT(type_ == ControlTypeBool);\n>\n>  \treturn bool_;\n>  }\n> @@ -142,7 +142,7 @@ bool ControlValue::getBool() const\n>   */\n>  int ControlValue::getInt() const\n>  {\n> -\tASSERT(type_ == ControlValueInteger || type_ == ControlValueInteger64);\n> +\tASSERT(type_ == ControlTypeInteger || type_ == ControlTypeInteger64);\n>\n>  \treturn integer_;\n>  }\n> @@ -156,7 +156,7 @@ int ControlValue::getInt() const\n>   */\n>  int64_t ControlValue::getInt64() const\n>  {\n> -\tASSERT(type_ == ControlValueInteger || type_ == ControlValueInteger64);\n> +\tASSERT(type_ == ControlTypeInteger || type_ == ControlTypeInteger64);\n>\n>  \treturn integer64_;\n>  }\n> @@ -168,13 +168,13 @@ int64_t ControlValue::getInt64() const\n>  std::string ControlValue::toString() const\n>  {\n>  \tswitch (type_) {\n> -\tcase ControlValueNone:\n> +\tcase ControlTypeNone:\n>  \t\treturn \"<None>\";\n> -\tcase ControlValueBool:\n> +\tcase ControlTypeBool:\n>  \t\treturn bool_ ? \"True\" : \"False\";\n> -\tcase ControlValueInteger:\n> +\tcase ControlTypeInteger:\n>  \t\treturn std::to_string(integer_);\n> -\tcase ControlValueInteger64:\n> +\tcase ControlTypeInteger64:\n>  \t\treturn std::to_string(integer64_);\n>  \t}\n>\n> diff --git a/src/libcamera/gen-controls.awk b/src/libcamera/gen-controls.awk\n> index f3d068123012..a3f291e7071c 100755\n> --- a/src/libcamera/gen-controls.awk\n> +++ b/src/libcamera/gen-controls.awk\n> @@ -92,7 +92,7 @@ function GenerateTable(file) {\n>  \tprint \"extern const std::unordered_map<ControlId, ControlIdentifier>\" > file\n>  \tprint \"controlTypes {\" > file\n>  \tfor (i=1; i <= id; ++i) {\n> -\t\tprintf \"\\t{ %s, { %s, \\\"%s\\\", ControlValue%s } },\\n\", names[i], names[i], names[i], types[i] > file\n> +\t\tprintf \"\\t{ %s, { %s, \\\"%s\\\", ControlType%s } },\\n\", names[i], names[i], names[i], types[i] > file\n>  \t}\n>  \tprint \"};\" > file\n>  \tExitNameSpace(file)\n> diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp\n> index aa3a65b1e5ef..8cda860b9fe9 100644\n> --- a/test/controls/control_info.cpp\n> +++ b/test/controls/control_info.cpp\n> @@ -26,7 +26,7 @@ protected:\n>  \t\tControlInfo info(Brightness);\n>\n>  \t\tif (info.id() != Brightness ||\n> -\t\t    info.type() != ControlValueInteger ||\n> +\t\t    info.type() != ControlTypeInteger ||\n>  \t\t    info.name() != std::string(\"Brightness\")) {\n>  \t\t\tcout << \"Invalid control identification for Brightness\" << endl;\n>  \t\t\treturn TestFail;\n> @@ -44,7 +44,7 @@ protected:\n>  \t\tinfo = ControlInfo(Contrast, 10, 200);\n>\n>  \t\tif (info.id() != Contrast ||\n> -\t\t    info.type() != ControlValueInteger ||\n> +\t\t    info.type() != ControlTypeInteger ||\n>  \t\t    info.name() != std::string(\"Contrast\")) {\n>  \t\t\tcout << \"Invalid control identification for Contrast\" << endl;\n>  \t\t\treturn TestFail;\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C099260BE8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 29 Sep 2019 10:50:44 +0200 (CEST)","from uno.localdomain\n\t(host7-199-dynamic.171-212-r.retail.telecomitalia.it [212.171.199.7])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id C260F100005;\n\tSun, 29 Sep 2019 08:50:43 +0000 (UTC)"],"Date":"Sun, 29 Sep 2019 10:52:26 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190929085226.gwnx5ec4e6oup5ou@uno.localdomain>","References":"<20190928152238.23752-1-laurent.pinchart@ideasonboard.com>\n\t<20190928152238.23752-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"sewhxblmh25ctmc7\"","Content-Disposition":"inline","In-Reply-To":"<20190928152238.23752-2-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 01/12] libcamera: controls: Rename\n\tControlValueType to ControlType","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sun, 29 Sep 2019 08:50:44 -0000"}},{"id":2729,"web_url":"https://patchwork.libcamera.org/comment/2729/","msgid":"<20190929112448.GA4827@pendragon.ideasonboard.com>","date":"2019-09-29T11:24:48","subject":"Re: [libcamera-devel] [PATCH 01/12] libcamera: controls: Rename\n\tControlValueType to ControlType","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Sun, Sep 29, 2019 at 10:52:26AM +0200, Jacopo Mondi wrote:\n> On Sat, Sep 28, 2019 at 06:22:27PM +0300, Laurent Pinchart wrote:\n> > The type of a control value is also the type of the control. Shorten the\n> > ControlValueType enumeration to ControlType, and rename ControlValue* to\n> > ControlType* for better clarity.\n> >\n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> > ---\n> >  include/libcamera/controls.h   | 20 +++++++-------\n> >  src/libcamera/controls.cpp     | 50 +++++++++++++++++-----------------\n> >  src/libcamera/gen-controls.awk |  2 +-\n> >  test/controls/control_info.cpp |  4 +--\n> >  4 files changed, 38 insertions(+), 38 deletions(-)\n> >\n> > diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> > index fbb3a62274c6..ffba880a66ff 100644\n> > --- a/include/libcamera/controls.h\n> > +++ b/include/libcamera/controls.h\n> > @@ -18,11 +18,11 @@ namespace libcamera {\n> >\n> >  class Camera;\n> >\n> > -enum ControlValueType {\n> > -\tControlValueNone,\n> > -\tControlValueBool,\n> > -\tControlValueInteger,\n> > -\tControlValueInteger64,\n> > +enum ControlType {\n> > +\tControlTypeNone,\n> > +\tControlTypeBool,\n> > +\tControlTypeInteger,\n> > +\tControlTypeInteger64,\n> \n> I wonder if these would not be worth being ControlBool,\n> ControlInteger etc...\n\nIt's a very good question, and something we may want to think of more\nglobally. Should enumerated values contain the enum name ? We have\nprecedents for both in libcamera, and unifying the code with a single\npolicy would be more consistent. The only issue I have at the moment is\nthat I'm not sure what the rule should be :-)\n\n> In any case\n> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n> \n> >  };\n> >\n> >  class ControlValue\n> > @@ -33,8 +33,8 @@ public:\n> >  \tControlValue(int value);\n> >  \tControlValue(int64_t value);\n> >\n> > -\tControlValueType type() const { return type_; };\n> > -\tbool isNone() const { return type_ == ControlValueNone; };\n> > +\tControlType type() const { return type_; };\n> > +\tbool isNone() const { return type_ == ControlTypeNone; };\n> >\n> >  \tvoid set(bool value);\n> >  \tvoid set(int value);\n> > @@ -47,7 +47,7 @@ public:\n> >  \tstd::string toString() const;\n> >\n> >  private:\n> > -\tControlValueType type_;\n> > +\tControlType type_;\n> >\n> >  \tunion {\n> >  \t\tbool bool_;\n> > @@ -59,7 +59,7 @@ private:\n> >  struct ControlIdentifier {\n> >  \tControlId id;\n> >  \tconst char *name;\n> > -\tControlValueType type;\n> > +\tControlType type;\n> >  };\n> >\n> >  class ControlInfo\n> > @@ -70,7 +70,7 @@ public:\n> >\n> >  \tControlId id() const { return ident_->id; }\n> >  \tconst char *name() const { return ident_->name; }\n> > -\tControlValueType type() const { return ident_->type; }\n> > +\tControlType type() const { return ident_->type; }\n> >\n> >  \tconst ControlValue &min() const { return min_; }\n> >  \tconst ControlValue &max() const { return max_; }\n> > diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> > index 727fdbd9450d..9960a30dfa03 100644\n> > --- a/src/libcamera/controls.cpp\n> > +++ b/src/libcamera/controls.cpp\n> > @@ -25,16 +25,16 @@ namespace libcamera {\n> >  LOG_DEFINE_CATEGORY(Controls)\n> >\n> >  /**\n> > - * \\enum ControlValueType\n> > - * \\brief Define the data type of value represented by a ControlValue\n> > - * \\var ControlValueNone\n> > - * Identifies an unset control value\n> > - * \\var ControlValueBool\n> > - * Identifies controls storing a boolean value\n> > - * \\var ControlValueInteger\n> > - * Identifies controls storing an integer value\n> > - * \\var ControlValueInteger64\n> > - * Identifies controls storing a 64-bit integer value\n> > + * \\enum ControlType\n> > + * \\brief Define the data type of a Control\n> > + * \\var ControlTypeNone\n> > + * Invalid type, for empty values\n> > + * \\var ControlTypeBool\n> > + * The control stores a boolean value\n> > + * \\var ControlTypeInteger\n> > + * The control stores an integer value\n> > + * \\var ControlTypeInteger64\n> > + * The control stores a 64-bit integer value\n> >   */\n> >\n> >  /**\n> > @@ -46,7 +46,7 @@ LOG_DEFINE_CATEGORY(Controls)\n> >   * \\brief Construct an empty ControlValue.\n> >   */\n> >  ControlValue::ControlValue()\n> > -\t: type_(ControlValueNone)\n> > +\t: type_(ControlTypeNone)\n> >  {\n> >  }\n> >\n> > @@ -55,7 +55,7 @@ ControlValue::ControlValue()\n> >   * \\param[in] value Boolean value to store\n> >   */\n> >  ControlValue::ControlValue(bool value)\n> > -\t: type_(ControlValueBool), bool_(value)\n> > +\t: type_(ControlTypeBool), bool_(value)\n> >  {\n> >  }\n> >\n> > @@ -64,7 +64,7 @@ ControlValue::ControlValue(bool value)\n> >   * \\param[in] value Integer value to store\n> >   */\n> >  ControlValue::ControlValue(int value)\n> > -\t: type_(ControlValueInteger), integer_(value)\n> > +\t: type_(ControlTypeInteger), integer_(value)\n> >  {\n> >  }\n> >\n> > @@ -73,7 +73,7 @@ ControlValue::ControlValue(int value)\n> >   * \\param[in] value Integer value to store\n> >   */\n> >  ControlValue::ControlValue(int64_t value)\n> > -\t: type_(ControlValueInteger64), integer64_(value)\n> > +\t: type_(ControlTypeInteger64), integer64_(value)\n> >  {\n> >  }\n> >\n> > @@ -86,7 +86,7 @@ ControlValue::ControlValue(int64_t value)\n> >  /**\n> >   * \\fn ControlValue::isNone()\n> >   * \\brief Determine if the value is not initialised\n> > - * \\return True if the value type is ControlValueNone, false otherwise\n> > + * \\return True if the value type is ControlTypeNone, false otherwise\n> >   */\n> >\n> >  /**\n> > @@ -95,7 +95,7 @@ ControlValue::ControlValue(int64_t value)\n> >   */\n> >  void ControlValue::set(bool value)\n> >  {\n> > -\ttype_ = ControlValueBool;\n> > +\ttype_ = ControlTypeBool;\n> >  \tbool_ = value;\n> >  }\n> >\n> > @@ -105,7 +105,7 @@ void ControlValue::set(bool value)\n> >   */\n> >  void ControlValue::set(int value)\n> >  {\n> > -\ttype_ = ControlValueInteger;\n> > +\ttype_ = ControlTypeInteger;\n> >  \tinteger_ = value;\n> >  }\n> >\n> > @@ -115,7 +115,7 @@ void ControlValue::set(int value)\n> >   */\n> >  void ControlValue::set(int64_t value)\n> >  {\n> > -\ttype_ = ControlValueInteger64;\n> > +\ttype_ = ControlTypeInteger64;\n> >  \tinteger64_ = value;\n> >  }\n> >\n> > @@ -128,7 +128,7 @@ void ControlValue::set(int64_t value)\n> >   */\n> >  bool ControlValue::getBool() const\n> >  {\n> > -\tASSERT(type_ == ControlValueBool);\n> > +\tASSERT(type_ == ControlTypeBool);\n> >\n> >  \treturn bool_;\n> >  }\n> > @@ -142,7 +142,7 @@ bool ControlValue::getBool() const\n> >   */\n> >  int ControlValue::getInt() const\n> >  {\n> > -\tASSERT(type_ == ControlValueInteger || type_ == ControlValueInteger64);\n> > +\tASSERT(type_ == ControlTypeInteger || type_ == ControlTypeInteger64);\n> >\n> >  \treturn integer_;\n> >  }\n> > @@ -156,7 +156,7 @@ int ControlValue::getInt() const\n> >   */\n> >  int64_t ControlValue::getInt64() const\n> >  {\n> > -\tASSERT(type_ == ControlValueInteger || type_ == ControlValueInteger64);\n> > +\tASSERT(type_ == ControlTypeInteger || type_ == ControlTypeInteger64);\n> >\n> >  \treturn integer64_;\n> >  }\n> > @@ -168,13 +168,13 @@ int64_t ControlValue::getInt64() const\n> >  std::string ControlValue::toString() const\n> >  {\n> >  \tswitch (type_) {\n> > -\tcase ControlValueNone:\n> > +\tcase ControlTypeNone:\n> >  \t\treturn \"<None>\";\n> > -\tcase ControlValueBool:\n> > +\tcase ControlTypeBool:\n> >  \t\treturn bool_ ? \"True\" : \"False\";\n> > -\tcase ControlValueInteger:\n> > +\tcase ControlTypeInteger:\n> >  \t\treturn std::to_string(integer_);\n> > -\tcase ControlValueInteger64:\n> > +\tcase ControlTypeInteger64:\n> >  \t\treturn std::to_string(integer64_);\n> >  \t}\n> >\n> > diff --git a/src/libcamera/gen-controls.awk b/src/libcamera/gen-controls.awk\n> > index f3d068123012..a3f291e7071c 100755\n> > --- a/src/libcamera/gen-controls.awk\n> > +++ b/src/libcamera/gen-controls.awk\n> > @@ -92,7 +92,7 @@ function GenerateTable(file) {\n> >  \tprint \"extern const std::unordered_map<ControlId, ControlIdentifier>\" > file\n> >  \tprint \"controlTypes {\" > file\n> >  \tfor (i=1; i <= id; ++i) {\n> > -\t\tprintf \"\\t{ %s, { %s, \\\"%s\\\", ControlValue%s } },\\n\", names[i], names[i], names[i], types[i] > file\n> > +\t\tprintf \"\\t{ %s, { %s, \\\"%s\\\", ControlType%s } },\\n\", names[i], names[i], names[i], types[i] > file\n> >  \t}\n> >  \tprint \"};\" > file\n> >  \tExitNameSpace(file)\n> > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp\n> > index aa3a65b1e5ef..8cda860b9fe9 100644\n> > --- a/test/controls/control_info.cpp\n> > +++ b/test/controls/control_info.cpp\n> > @@ -26,7 +26,7 @@ protected:\n> >  \t\tControlInfo info(Brightness);\n> >\n> >  \t\tif (info.id() != Brightness ||\n> > -\t\t    info.type() != ControlValueInteger ||\n> > +\t\t    info.type() != ControlTypeInteger ||\n> >  \t\t    info.name() != std::string(\"Brightness\")) {\n> >  \t\t\tcout << \"Invalid control identification for Brightness\" << endl;\n> >  \t\t\treturn TestFail;\n> > @@ -44,7 +44,7 @@ protected:\n> >  \t\tinfo = ControlInfo(Contrast, 10, 200);\n> >\n> >  \t\tif (info.id() != Contrast ||\n> > -\t\t    info.type() != ControlValueInteger ||\n> > +\t\t    info.type() != ControlTypeInteger ||\n> >  \t\t    info.name() != std::string(\"Contrast\")) {\n> >  \t\t\tcout << \"Invalid control identification for Contrast\" << endl;\n> >  \t\t\treturn TestFail;\n> > --\n> > Regards,\n> >\n> > Laurent Pinchart\n> >\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7AED561654\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 29 Sep 2019 13:25:00 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DCEF1320;\n\tSun, 29 Sep 2019 13:24:59 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1569756300;\n\tbh=COqpwY0wRTp8P4MrHV3fjwY0/7y0zFuA7hbbPzVSySM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=n8ied2PUD1Yd4bHfHsC8xlANT7ldT24xGoWWPL8VMi4JNhxlB5d84v0WmUtveO0JA\n\tMIEiKwwPTgD4t+oAtHmb7YpaLodFVBH9wNzcI80/bjA+Nx+g3mkrZjb12eu3zdOAxu\n\tYsW5R3N5h4Tau4FKO8mODAgtU5nJK2KFwhEyRJzA=","Date":"Sun, 29 Sep 2019 14:24:48 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190929112448.GA4827@pendragon.ideasonboard.com>","References":"<20190928152238.23752-1-laurent.pinchart@ideasonboard.com>\n\t<20190928152238.23752-2-laurent.pinchart@ideasonboard.com>\n\t<20190929085226.gwnx5ec4e6oup5ou@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190929085226.gwnx5ec4e6oup5ou@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 01/12] libcamera: controls: Rename\n\tControlValueType to ControlType","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sun, 29 Sep 2019 11:25:00 -0000"}}]