From patchwork Tue May 24 11:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 16023 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 51049C3276 for ; Tue, 24 May 2022 11:46:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 79A256568B; Tue, 24 May 2022 13:46:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1653392814; bh=Is73O9BqX93oyE9wi7SihC8QIUCguU6UCufvnn/heN8=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=rh+2VN9+byow/PJszN2s4rUfZXdgNUs7ghMM4fS/fx2G0llj5biP6Flb5uEfHgq7R /Tsh5bOkl8/4gs4drEiyG9hdEfjZt0HfH+RL4LQ6bKPmxRtA1sCdYhwu6vDhi1sm6R +F84pDv3IStRp+MI2STsm+fMgEhagqOg6xE8Nm6cJu1ROcKHl9SryRLLvs9Hys4kSj QeTeWo3Lpa+RGV+t6KfixaVg6IS25qVIkpsa7wHwkA5LIt3DZRS+AcKwUZ9wPrOlO+ mGkYVhP5CEUMv5O1VcIcDGwCaJe0MB/Kp/PTyLlGgVh2J/hnU8De6jyHpwo2mNNmju dKb5OGeDalqPg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1180065685 for ; Tue, 24 May 2022 13:46:39 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="UnAn880U"; dkim-atps=neutral Received: from deskari.lan (91-156-85-209.elisa-laajakaista.fi [91.156.85.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 642304A8; Tue, 24 May 2022 13:46:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1653392798; bh=Is73O9BqX93oyE9wi7SihC8QIUCguU6UCufvnn/heN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UnAn880UduCX0ei70d3ZVAFTdGVwKPQuBMhR/1lM432bzBuojz3uThJNW8LzCoQ40 Dzr6Z4+t3ojmN61RFaD/7cn5nxxvDV/yEiyIm7AFs7D8i1zWqXLViM5xdEhDsFsgXi 0OIGw10ah3DfigKHaC0D33BiRgH/dMmV6PgCD0Rw= To: libcamera-devel@lists.libcamera.org, David Plowman , Kieran Bingham , Laurent Pinchart , Jacopo Mondi Date: Tue, 24 May 2022 14:46:08 +0300 Message-Id: <20220524114610.41848-18-tomi.valkeinen@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220524114610.41848-1-tomi.valkeinen@ideasonboard.com> References: <20220524114610.41848-1-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 17/19] py: Rename 'efd' to 'event_fd' X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tomi Valkeinen via libcamera-devel From: Tomi Valkeinen Reply-To: Tomi Valkeinen Cc: Tomi Valkeinen Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Tomi Valkeinen Perhaps it's better to have a more descriptive name here. I also considered just renaming 'efd' to 'fd', but 'event_fd' won. Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart --- src/py/cam/cam_kms.py | 2 +- src/py/cam/cam_null.py | 2 +- src/py/cam/cam_qt.py | 2 +- src/py/cam/cam_qtgl.py | 2 +- src/py/examples/itest.py | 2 +- src/py/examples/simple-continuous-capture.py | 2 +- src/py/libcamera/py_main.cpp | 2 +- test/py/unittests.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/py/cam/cam_kms.py b/src/py/cam/cam_kms.py index 213e0b03..49b00211 100644 --- a/src/py/cam/cam_kms.py +++ b/src/py/cam/cam_kms.py @@ -161,7 +161,7 @@ class KMSRenderer: sel = selectors.DefaultSelector() sel.register(self.card.fd, selectors.EVENT_READ, self.readdrm) - sel.register(self.cm.efd, selectors.EVENT_READ, self.readcam) + sel.register(self.cm.event_fd, selectors.EVENT_READ, self.readcam) sel.register(sys.stdin, selectors.EVENT_READ, self.readkey) print('Press enter to exit') diff --git a/src/py/cam/cam_null.py b/src/py/cam/cam_null.py index 45c5f467..40dbd266 100644 --- a/src/py/cam/cam_null.py +++ b/src/py/cam/cam_null.py @@ -23,7 +23,7 @@ class NullRenderer: self.running = True sel = selectors.DefaultSelector() - sel.register(self.cm.efd, selectors.EVENT_READ, self.readcam) + sel.register(self.cm.event_fd, selectors.EVENT_READ, self.readcam) sel.register(sys.stdin, selectors.EVENT_READ, self.readkey) print('Press enter to exit') diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py index 739e9749..d8d6a98f 100644 --- a/src/py/cam/cam_qt.py +++ b/src/py/cam/cam_qt.py @@ -193,7 +193,7 @@ class QtRenderer: self.windows = windows def run(self): - camnotif = QtCore.QSocketNotifier(self.cm.efd, QtCore.QSocketNotifier.Read) + camnotif = QtCore.QSocketNotifier(self.cm.event_fd, QtCore.QSocketNotifier.Read) camnotif.activated.connect(lambda _: self.readcam()) keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read) diff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py index 5f7ccf1e..4b43f51d 100644 --- a/src/py/cam/cam_qtgl.py +++ b/src/py/cam/cam_qtgl.py @@ -142,7 +142,7 @@ class QtRenderer: self.window = window def run(self): - camnotif = QtCore.QSocketNotifier(self.state.cm.efd, QtCore.QSocketNotifier.Read) + camnotif = QtCore.QSocketNotifier(self.state.cm.event_fd, QtCore.QSocketNotifier.Read) camnotif.activated.connect(lambda _: self.readcam()) keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read) diff --git a/src/py/examples/itest.py b/src/py/examples/itest.py index 01e020e2..2d1c6453 100755 --- a/src/py/examples/itest.py +++ b/src/py/examples/itest.py @@ -66,7 +66,7 @@ def capture(ctx): # Use Selector to wait for events from the camera and from the keyboard sel = selectors.DefaultSelector() - sel.register(cm.efd, selectors.EVENT_READ, lambda fd: handle_camera_event(ctx)) + sel.register(cm.event_fd, selectors.EVENT_READ, lambda fd: handle_camera_event(ctx)) reqs = [] diff --git a/src/py/examples/simple-continuous-capture.py b/src/py/examples/simple-continuous-capture.py index 05fa2ada..12708914 100755 --- a/src/py/examples/simple-continuous-capture.py +++ b/src/py/examples/simple-continuous-capture.py @@ -76,7 +76,7 @@ def capture(cm, cam, reqs): # Use Selector to wait for events from the camera and from the keyboard sel = selectors.DefaultSelector() - sel.register(cm.efd, selectors.EVENT_READ, lambda fd: handle_camera_event(cm, cam)) + sel.register(cm.event_fd, selectors.EVENT_READ, lambda fd: handle_camera_event(cm, cam)) sel.register(sys.stdin, selectors.EVENT_READ, handle_key_envet) reqs = [] diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp index 80f26c12..3fd5c0fc 100644 --- a/src/py/libcamera/py_main.cpp +++ b/src/py/libcamera/py_main.cpp @@ -209,7 +209,7 @@ PYBIND11_MODULE(_libcamera, m) .def_property_readonly("version", &CameraManager::version) - .def_property_readonly("efd", [](CameraManager &) { + .def_property_readonly("event_fd", [](CameraManager &) { return gEventfd; }) diff --git a/test/py/unittests.py b/test/py/unittests.py index 8c445bc9..426efb06 100755 --- a/test/py/unittests.py +++ b/test/py/unittests.py @@ -269,7 +269,7 @@ class SimpleCaptureMethods(CameraTesterBase): gc.collect() sel = selectors.DefaultSelector() - sel.register(cm.efd, selectors.EVENT_READ) + sel.register(cm.event_fd, selectors.EVENT_READ) reqs = []