[{"id":23053,"web_url":"https://patchwork.libcamera.org/comment/23053/","msgid":"","date":"2022-05-18T13:44:24","subject":"Re: [libcamera-devel] [PATCH v3 16/18] py: clean up control enums\n\tgeneration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Tomi,\n\nThank you for the patch.\n\nOn Wed, May 18, 2022 at 04:13:27PM +0300, Tomi Valkeinen wrote:\n> Try to be more consistent with the names, and include \"control\" in all\n> the names.\n> \n> Also drop a useless \"using namespace libcamera\" and only include\n> \"control_ids.h\".\n> \n> Signed-off-by: Tomi Valkeinen \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/py/libcamera/meson.build | 12 +++++-------\n> ...ated.cpp.in => py_control_enums_generated.cpp.in} | 8 +++-----\n> src/py/libcamera/py_main.cpp | 4 ++--\n> 3 files changed, 10 insertions(+), 14 deletions(-)\n> rename src/py/libcamera/{py_enums_generated.cpp.in => py_control_enums_generated.cpp.in} (63%)\n> \n> diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\n> index 55957252..a3388c63 100644\n> --- a/src/py/libcamera/meson.build\n> +++ b/src/py/libcamera/meson.build\n> @@ -18,20 +18,18 @@ pycamera_sources = files([\n> 'py_main.cpp',\n> ])\n> \n> -gen_input_files = files([\n> +gen_py_control_enums_input_files = files([\n> '../../libcamera/control_ids.yaml',\n> - 'py_enums_generated.cpp.in',\n> + 'py_control_enums_generated.cpp.in',\n> ])\n> \n> gen_py_control_enums = files('gen-py-control-enums.py')\n> \n> -generated_sources = custom_target('py_gen_controls',\n> - input : gen_input_files,\n> - output : ['py_enums_generated.cpp'],\n> +pycamera_sources += custom_target('py_gen_controls',\n> + input : gen_py_control_enums_input_files,\n> + output : ['py_control_enums_generated.cpp'],\n> command : [gen_py_control_enums, '-o', '@OUTPUT@', '@INPUT@'])\n> \n> -pycamera_sources += generated_sources\n> -\n> pycamera_deps = [\n> libcamera_public,\n> py3_dep,\n> diff --git a/src/py/libcamera/py_enums_generated.cpp.in b/src/py/libcamera/py_control_enums_generated.cpp.in\n> similarity index 63%\n> rename from src/py/libcamera/py_enums_generated.cpp.in\n> rename to src/py/libcamera/py_control_enums_generated.cpp.in\n> index 20e07528..ed81fbe7 100644\n> --- a/src/py/libcamera/py_enums_generated.cpp.in\n> +++ b/src/py/libcamera/py_control_enums_generated.cpp.in\n> @@ -2,20 +2,18 @@\n> /*\n> * Copyright (C) 2022, Tomi Valkeinen \n> *\n> - * Python bindings - Auto-generated enums\n> + * Python bindings - Auto-generated control enums\n> *\n> * This file is auto-generated. Do not edit.\n> */\n> \n> -#include \n> +#include \n> \n> #include \n> \n> namespace py = pybind11;\n> \n> -using namespace libcamera;\n> -\n> -void init_py_enums_generated(py::module& m)\n> +void init_py_control_enums_generated(py::module& m)\n> {\n> ${enums}\n> }\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index b05bbb22..1d941160 100644\n> --- a/src/py/libcamera/py_main.cpp\n> +++ b/src/py/libcamera/py_main.cpp\n> @@ -131,13 +131,13 @@ static void handleRequestCompleted(Request *req)\n> }\n> \n> void init_py_enums(py::module &m);\n> -void init_py_enums_generated(py::module &m);\n> +void init_py_control_enums_generated(py::module &m);\n> void init_py_geometry(py::module &m);\n> \n> PYBIND11_MODULE(_libcamera, m)\n> {\n> \tinit_py_enums(m);\n> -\tinit_py_enums_generated(m);\n> +\tinit_py_control_enums_generated(m);\n> \tinit_py_geometry(m);\n> \n> \t/* Forward declarations */","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4F98FC0F2A\n\tfor ;\n\tWed, 18 May 2022 13:44:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 13D3B65659;\n\tWed, 18 May 2022 15:44:32 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 42CB465656\n\tfor ;\n\tWed, 18 May 2022 15:44:31 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [45.131.31.124])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CCE66E50;\n\tWed, 18 May 2022 15:44:30 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652881472;\n\tbh=CwgF24iNuEjvXP7+Bvp17kFvGQUxqE6J/C518+ZDL3o=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=H14yoQhIQoM14Z8LuyGxXybfPpbvu5Cbz48f5XeO+29eb9aUN5dsA1WwisqzC1+Ka\n\t/0Bu9zT/ZuNMNlXltGYz5ccIQG/lRam0Y5eA4mOYbbbx7G/BTZilbFXj+entuQpSEc\n\tym1jiR5462+kCgROcSZzzdLBHSN06u4IOu2uDycz2ANQIgPe6iWIPmjJ8ZLWYbE4YG\n\tOcOuXITJxh2iDD2vQLhwkvOOj6ktwUKhxn3w5kOi0UcO5Dddm3rUEGMsz8TttkSYdr\n\tecn20lmN3R68yr9apjM+xe1zEUhS2f6ZNVVX/UPfXDSqEKp2Ql3eJwqzfFsiA69Y0I\n\tRyFoUL+1siA7w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652881471;\n\tbh=CwgF24iNuEjvXP7+Bvp17kFvGQUxqE6J/C518+ZDL3o=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=cW8aM3PPwrYVN2gru+KwvWnUHIoPwA6qRrVBfyClm/LxFEeyxXtSF/sHeEnhu/YLx\n\tDnhPxn+Tljiaa7nF7qgkjRzJsmiuE+QFk1tWaWawx8BP9GHXzWmf2KLxdzrsmgkffy\n\tpt+iasZsUG39ZUjWP78CrwR+W+zkNM+2mftiZAqo="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"cW8aM3PP\"; dkim-atps=neutral","Date":"Wed, 18 May 2022 16:44:24 +0300","To":"Tomi Valkeinen ","Message-ID":"","References":"<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>\n\t<20220518131329.66994-17-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220518131329.66994-17-tomi.valkeinen@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 16/18] py: clean up control enums\n\tgeneration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23060,"web_url":"https://patchwork.libcamera.org/comment/23060/","msgid":"<165288305932.368702.18356739904548770065@Monstersaurus>","date":"2022-05-18T14:10:59","subject":"Re: [libcamera-devel] [PATCH v3 16/18] py: clean up control enums\n\tgeneration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2022-05-18 14:44:24)\n> Hi Tomi,\n> \n> Thank you for the patch.\n> \n> On Wed, May 18, 2022 at 04:13:27PM +0300, Tomi Valkeinen wrote:\n> > Try to be more consistent with the names, and include \"control\" in all\n> > the names.\n> > \n> > Also drop a useless \"using namespace libcamera\" and only include\n> > \"control_ids.h\".\n> > \n> > Signed-off-by: Tomi Valkeinen \n> \n> Reviewed-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> \n> > ---\n> > src/py/libcamera/meson.build | 12 +++++-------\n> > ...ated.cpp.in => py_control_enums_generated.cpp.in} | 8 +++-----\n> > src/py/libcamera/py_main.cpp | 4 ++--\n> > 3 files changed, 10 insertions(+), 14 deletions(-)\n> > rename src/py/libcamera/{py_enums_generated.cpp.in => py_control_enums_generated.cpp.in} (63%)\n> > \n> > diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\n> > index 55957252..a3388c63 100644\n> > --- a/src/py/libcamera/meson.build\n> > +++ b/src/py/libcamera/meson.build\n> > @@ -18,20 +18,18 @@ pycamera_sources = files([\n> > 'py_main.cpp',\n> > ])\n> > \n> > -gen_input_files = files([\n> > +gen_py_control_enums_input_files = files([\n> > '../../libcamera/control_ids.yaml',\n> > - 'py_enums_generated.cpp.in',\n> > + 'py_control_enums_generated.cpp.in',\n> > ])\n> > \n> > gen_py_control_enums = files('gen-py-control-enums.py')\n> > \n> > -generated_sources = custom_target('py_gen_controls',\n> > - input : gen_input_files,\n> > - output : ['py_enums_generated.cpp'],\n> > +pycamera_sources += custom_target('py_gen_controls',\n> > + input : gen_py_control_enums_input_files,\n> > + output : ['py_control_enums_generated.cpp'],\n> > command : [gen_py_control_enums, '-o', '@OUTPUT@', '@INPUT@'])\n> > \n> > -pycamera_sources += generated_sources\n> > -\n> > pycamera_deps = [\n> > libcamera_public,\n> > py3_dep,\n> > diff --git a/src/py/libcamera/py_enums_generated.cpp.in b/src/py/libcamera/py_control_enums_generated.cpp.in\n> > similarity index 63%\n> > rename from src/py/libcamera/py_enums_generated.cpp.in\n> > rename to src/py/libcamera/py_control_enums_generated.cpp.in\n> > index 20e07528..ed81fbe7 100644\n> > --- a/src/py/libcamera/py_enums_generated.cpp.in\n> > +++ b/src/py/libcamera/py_control_enums_generated.cpp.in\n> > @@ -2,20 +2,18 @@\n> > /*\n> > * Copyright (C) 2022, Tomi Valkeinen \n> > *\n> > - * Python bindings - Auto-generated enums\n> > + * Python bindings - Auto-generated control enums\n> > *\n> > * This file is auto-generated. Do not edit.\n> > */\n> > \n> > -#include \n> > +#include \n> > \n> > #include \n> > \n> > namespace py = pybind11;\n> > \n> > -using namespace libcamera;\n> > -\n> > -void init_py_enums_generated(py::module& m)\n> > +void init_py_control_enums_generated(py::module& m)\n> > {\n> > ${enums}\n> > }\n> > diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> > index b05bbb22..1d941160 100644\n> > --- a/src/py/libcamera/py_main.cpp\n> > +++ b/src/py/libcamera/py_main.cpp\n> > @@ -131,13 +131,13 @@ static void handleRequestCompleted(Request *req)\n> > }\n> > \n> > void init_py_enums(py::module &m);\n> > -void init_py_enums_generated(py::module &m);\n> > +void init_py_control_enums_generated(py::module &m);\n> > void init_py_geometry(py::module &m);\n> > \n> > PYBIND11_MODULE(_libcamera, m)\n> > {\n> > init_py_enums(m);\n> > - init_py_enums_generated(m);\n> > + init_py_control_enums_generated(m);\n> > init_py_geometry(m);\n> > \n> > /* Forward declarations */\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 7A839C3256\n\tfor ;\n\tWed, 18 May 2022 14:11:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2BC3F65659;\n\tWed, 18 May 2022 16:11:03 +0200 (CEST)","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 2296265656\n\tfor ;\n\tWed, 18 May 2022 16:11:02 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C1DF5E50;\n\tWed, 18 May 2022 16:11:01 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652883063;\n\tbh=AHXpH0G+SVj+trtwPgLdaV6CgK00hXZELn31wZqYKRo=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=cGlexnZSjK0aeA/HmWiVgDG3Nx5fZ1ZV52YOsTMIk4rOKNZB4gLY2xhvmk8lISweM\n\tYObd4OIxIqNTLak6bhMjX+ubiXKOG74Sroqmd4u6e8MqygYqYNFI9Qi0EbrG8t9kkf\n\tWBe4MHYl/kPDUstcdNje1vv01lSpIDNdB4l5BZy9AhdQ4ZYoPdYn6vdZvpeQzWEYzI\n\tv4jcVrcVK/Z836/lSGa5DgD9mG8RTwIGFtKroqFXzty4Ybvv7ZpEEQSp55KkJ8VaV0\n\t4T+w89PNiqfKJo83hYTVtkqGI+KD8FCBzlosbxDy3zf5O5yRBTOcANC4dXlYtr5oJe\n\tIzKymPs4l03cg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652883061;\n\tbh=AHXpH0G+SVj+trtwPgLdaV6CgK00hXZELn31wZqYKRo=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=ovj/sBoGA6IqwFssHemkHlP0GPIfNndwom7RQZYcLd3d4eCXdBP6GSKmfl5nCeQJq\n\tFM0ErTAli+MuPN4F3ogN5QS3oYtGv+FDcsroM/eXYnzkclwxDQlxTB7o+dShmw1aSO\n\tCX1io/xsleG/7eRvHDuuvU4GJjYUQoG+Db5jmZtQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ovj/sBoG\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"","References":"<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>\n\t<20220518131329.66994-17-tomi.valkeinen@ideasonboard.com>\n\t","To":"Laurent Pinchart ,\n\tTomi Valkeinen ","Date":"Wed, 18 May 2022 15:10:59 +0100","Message-ID":"<165288305932.368702.18356739904548770065@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v3 16/18] py: clean up control enums\n\tgeneration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]