diff options
| author | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2022-05-27 17:44:31 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-05-27 22:03:41 +0300 |
| commit | 7a0a464dd13e3c0c266267dfcae75f5f09434cbf (patch) | |
| tree | 1c98868eb95602b140f8e7b091ba8744aaa314c9 | |
| parent | 1698442aa8e3aed1fe0b2323dada6d5e1f2515a3 (diff) | |
py: Rename 'efd' to 'event_fd'
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 <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | src/py/cam/cam_kms.py | 2 | ||||
| -rw-r--r-- | src/py/cam/cam_null.py | 2 | ||||
| -rw-r--r-- | src/py/cam/cam_qt.py | 2 | ||||
| -rw-r--r-- | src/py/cam/cam_qtgl.py | 2 | ||||
| -rw-r--r-- | src/py/libcamera/py_main.cpp | 2 | ||||
| -rwxr-xr-x | test/py/unittests.py | 2 |
6 files changed, 6 insertions, 6 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 e2395c4b..c294c999 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/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp index 4fb66866..f903f1d2 100644 --- a/src/py/libcamera/py_main.cpp +++ b/src/py/libcamera/py_main.cpp @@ -205,7 +205,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 = [] |