From 2bd85abc108e0688384f42b0ec83dcd5a622d50d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 22 Dec 2022 12:04:50 +0200 Subject: Code formatting fixes Signed-off-by: Tomi Valkeinen --- py/pykms/pykmsbase.cpp | 44 ++++++++++++++++++++------------------------ py/pyv4l2/pyv4l2.cpp | 11 ++++------- 2 files changed, 24 insertions(+), 31 deletions(-) (limited to 'py') diff --git a/py/pykms/pykmsbase.cpp b/py/pykms/pykmsbase.cpp index 79ddbf6..7484770 100644 --- a/py/pykms/pykmsbase.cpp +++ b/py/pykms/pykmsbase.cpp @@ -65,7 +65,7 @@ void init_pykmsbase(py::module& m) .def("refresh_props", &DrmPropObject::refresh_props) .def_property_readonly("prop_map", &DrmPropObject::get_prop_map) .def("get_prop_value", (uint64_t(DrmPropObject::*)(const string&) const) & DrmPropObject::get_prop_value) - .def("set_prop_value", (int (DrmPropObject::*)(const string&, uint64_t)) & DrmPropObject::set_prop_value) + .def("set_prop_value", (int(DrmPropObject::*)(const string&, uint64_t)) & DrmPropObject::set_prop_value) .def("get_prop_value_as_blob", &DrmPropObject::get_prop_value_as_blob) .def("get_prop", &DrmPropObject::get_prop) .def("has_prop", &DrmPropObject::has_prop); @@ -85,8 +85,8 @@ void init_pykmsbase(py::module& m) .def("refresh", &Connector::refresh); py::class_>(m, "Crtc") - .def("set_mode", (int (Crtc::*)(Connector*, const Videomode&)) & Crtc::set_mode) - .def("set_mode", (int (Crtc::*)(Connector*, Framebuffer&, const Videomode&)) & Crtc::set_mode) + .def("set_mode", (int(Crtc::*)(Connector*, const Videomode&)) & Crtc::set_mode) + .def("set_mode", (int(Crtc::*)(Connector*, Framebuffer&, const Videomode&)) & Crtc::set_mode) .def("disable_mode", &Crtc::disable_mode) .def( "page_flip", @@ -123,8 +123,7 @@ void init_pykmsbase(py::module& m) .def_property_readonly("type", &Property::type) .def_property_readonly("enums", &Property::get_enums) .def_property_readonly("values", &Property::get_values) - .def("__repr__", [](const Property& o) { return ""; }) - ; + .def("__repr__", [](const Property& o) { return ""; }); py::enum_(m, "PropertyType") .value("Range", PropertyType::Range) @@ -132,8 +131,7 @@ void init_pykmsbase(py::module& m) .value("Blob", PropertyType::Blob) .value("Bitmask", PropertyType::Bitmask) .value("Object", PropertyType::Object) - .value("SignedRange", PropertyType::SignedRange) - ; + .value("SignedRange", PropertyType::SignedRange); py::class_(m, "Blob") .def(py::init([](Card& card, py::buffer buf) { @@ -165,8 +163,8 @@ void init_pykmsbase(py::module& m) .def("offset", &Framebuffer::offset) .def("fd", &Framebuffer::prime_fd) - .def("flush", (void (Framebuffer::*)(void)) & Framebuffer::flush) - .def("flush", (void (Framebuffer::*)(uint32_t x, uint32_t y, uint32_t width, uint32_t height)) & Framebuffer::flush) + .def("flush", (void(Framebuffer::*)(void)) & Framebuffer::flush) + .def("flush", (void(Framebuffer::*)(uint32_t x, uint32_t y, uint32_t width, uint32_t height)) & Framebuffer::flush) // XXX pybind11 doesn't support a base object (DrmObject) with custom holder-type, // and a subclass with standard holder-type. @@ -181,16 +179,14 @@ void init_pykmsbase(py::module& m) py::keep_alive<1, 2>()) // Keep Card alive until this is destructed .def(py::init(), py::keep_alive<1, 2>()) // Keep Card alive until this is destructed - .def("__repr__", [](const DumbFramebuffer& o) { return ""; }) - ; + .def("__repr__", [](const DumbFramebuffer& o) { return ""; }); py::class_(m, "DmabufFramebuffer") .def(py::init, vector, vector>(), py::keep_alive<1, 2>()) // Keep Card alive until this is destructed .def(py::init, vector, vector>(), py::keep_alive<1, 2>()) // Keep Card alive until this is destructed - .def("__repr__", [](const DmabufFramebuffer& o) { return ""; }) - ; + .def("__repr__", [](const DmabufFramebuffer& o) { return ""; }); py::enum_(m, "PixelFormat") .value("Undefined", PixelFormat::Undefined) @@ -291,9 +287,9 @@ void init_pykmsbase(py::module& m) py::class_(m, "AtomicReq") .def(py::init(), py::keep_alive<1, 2>()) // Keep Card alive until this is destructed - .def("add", (void (AtomicReq::*)(DrmPropObject*, const string&, uint64_t)) & AtomicReq::add) - .def("add", (void (AtomicReq::*)(DrmPropObject*, Property*, uint64_t)) & AtomicReq::add) - .def("add", (void (AtomicReq::*)(DrmPropObject*, const map&)) & AtomicReq::add) + .def("add", (void(AtomicReq::*)(DrmPropObject*, const string&, uint64_t)) & AtomicReq::add) + .def("add", (void(AtomicReq::*)(DrmPropObject*, Property*, uint64_t)) & AtomicReq::add) + .def("add", (void(AtomicReq::*)(DrmPropObject*, const map&)) & AtomicReq::add) .def("test", &AtomicReq::test, py::arg("allow_modeset") = false) .def( "commit", @@ -306,17 +302,17 @@ void init_pykmsbase(py::module& m) py::class_(m, "PixelFormatPlaneInfo") .def_readonly("bitspp", &PixelFormatPlaneInfo::bitspp) .def_readonly("xsub", &PixelFormatPlaneInfo::xsub) - .def_readonly("ysub", &PixelFormatPlaneInfo::ysub) - ; + .def_readonly("ysub", &PixelFormatPlaneInfo::ysub); py::class_(m, "PixelFormatInfo") .def_readonly("num_planes", &PixelFormatInfo::num_planes) - .def("plane", [](const PixelFormatInfo& self, uint32_t idx) { - if (idx >= self.num_planes) - throw runtime_error("invalid plane number"); - return self.planes[idx]; - }, py::return_value_policy::reference_internal) - ; + .def( + "plane", [](const PixelFormatInfo& self, uint32_t idx) { + if (idx >= self.num_planes) + throw runtime_error("invalid plane number"); + return self.planes[idx]; + }, + py::return_value_policy::reference_internal); m.def("get_pixel_format_info", &get_pixel_format_info, py::return_value_policy::reference_internal); diff --git a/py/pyv4l2/pyv4l2.cpp b/py/pyv4l2/pyv4l2.cpp index 33d5f26..b88ab5e 100644 --- a/py/pyv4l2/pyv4l2.cpp +++ b/py/pyv4l2/pyv4l2.cpp @@ -25,18 +25,17 @@ PYBIND11_MODULE(pyv4l2, m) py::enum_(m, "VideoMemoryType") .value("MMAP", VideoMemoryType::MMAP) - .value("DMABUF", VideoMemoryType::DMABUF) - ; + .value("DMABUF", VideoMemoryType::DMABUF); m.def("create_dmabuffer", [](int fd) { - VideoBuffer buf {}; + VideoBuffer buf{}; buf.m_mem_type = VideoMemoryType::DMABUF; buf.m_fd = fd; return buf; }); m.def("create_mmapbuffer", []() { - VideoBuffer buf {}; + VideoBuffer buf{}; buf.m_mem_type = VideoMemoryType::MMAP; return buf; }); @@ -45,8 +44,7 @@ PYBIND11_MODULE(pyv4l2, m) .def_readonly("index", &VideoBuffer::m_index) .def_readonly("offset", &VideoBuffer::m_offset) .def_readonly("fd", &VideoBuffer::m_fd) - .def_readonly("length", &VideoBuffer::m_length) - ; + .def_readonly("length", &VideoBuffer::m_length); py::class_(m, "VideoStreamer") .def_property_readonly("fd", &VideoStreamer::fd) @@ -113,7 +111,6 @@ PYBIND11_MODULE(pyv4l2, m) .value("META_8", PixelFormat::META_8) .value("META_16", PixelFormat::META_16); - m.def("fourcc_to_pixelformat", &FourCCToPixelFormat); m.def("pixelformat_to_fourcc", &PixelFormatToFourCC); m.def("drm_fourcc_to_pixelformat", &DRMFourCCToPixelFormat); -- cgit v1.2.3