NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

py: Rename 'efd' to 'event_fd'

Browse source 
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>
This commit is contained in:
Tomi Valkeinen 2022-05-27 17:44:31 +03:00 • committed by Laurent Pinchart
parent 1698442aa8
commit 7a0a464dd1
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/py/cam/cam_kms.py
View file

@ -161,7 +161,7 @@ class KMSRenderer:
sel = selectors.DefaultSelector() sel = selectors.DefaultSelector()
sel.register(self.card.fd, selectors.EVENT_READ, self.readdrm) 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) sel.register(sys.stdin, selectors.EVENT_READ, self.readkey)
print('Press enter to exit') print('Press enter to exit')

2
src/py/cam/cam_null.py
View file

@ -23,7 +23,7 @@ class NullRenderer:
self.running = True self.running = True
sel = selectors.DefaultSelector() 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) sel.register(sys.stdin, selectors.EVENT_READ, self.readkey)
print('Press enter to exit') print('Press enter to exit')

2
src/py/cam/cam_qt.py
View file

@ -193,7 +193,7 @@ class QtRenderer:
self.windows = windows self.windows = windows
def run(self): 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()) camnotif.activated.connect(lambda _: self.readcam())
keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read) keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)

2
src/py/cam/cam_qtgl.py
View file

@ -142,7 +142,7 @@ class QtRenderer:
self.window = window self.window = window
def run(self): 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()) camnotif.activated.connect(lambda _: self.readcam())
keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read) keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)

2
src/py/libcamera/py_main.cpp
View file

@ -205,7 +205,7 @@ PYBIND11_MODULE(_libcamera, m)
.def_property_readonly("version", &CameraManager::version) .def_property_readonly("version", &CameraManager::version)
.def_property_readonly("efd", [](CameraManager &) { .def_property_readonly("event_fd", [](CameraManager &) {
return gEventfd; return gEventfd;
}) })

2
test/py/unittests.py
View file

@ -269,7 +269,7 @@ class SimpleCaptureMethods(CameraTesterBase):
gc.collect() gc.collect()
sel = selectors.DefaultSelector() sel = selectors.DefaultSelector()
sel.register(cm.efd, selectors.EVENT_READ) sel.register(cm.event_fd, selectors.EVENT_READ)
reqs = [] reqs = []