[libcamera-devel] [PATCH 1/7] libcamera: v4l2_device: Rename format() method to getFormat()

Jacopo Mondi jacopo at jmondi.org
Fri Feb 1 16:42:42 CET 2019


Rename format() to getFormat() to reflect the v4l2 API names more
closely.

Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/libcamera/include/v4l2_device.h | 2 +-
 src/libcamera/v4l2_device.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h
index f68b2b1..70e3c00 100644
--- a/src/libcamera/include/v4l2_device.h
+++ b/src/libcamera/include/v4l2_device.h
@@ -86,7 +86,7 @@ public:
 	const char *deviceName() const { return caps_.card(); }
 	const char *busName() const { return caps_.bus_info(); }
 
-	int format(V4L2DeviceFormat *fmt);
+	int getFormat(V4L2DeviceFormat *fmt);
 	int setFormat(V4L2DeviceFormat *fmt);
 
 private:
diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp
index 5c415d0..26b6ff3 100644
--- a/src/libcamera/v4l2_device.cpp
+++ b/src/libcamera/v4l2_device.cpp
@@ -282,7 +282,7 @@ void V4L2Device::close()
  * \brief Retrieve the image format set on the V4L2 device
  * \return 0 for success, a negative error code otherwise
  */
-int V4L2Device::format(V4L2DeviceFormat *fmt)
+int V4L2Device::getFormat(V4L2DeviceFormat *fmt)
 {
 	return caps_.isMultiplanar() ? getFormatMultiplane(fmt) :
 				       getFormatSingleplane(fmt);
-- 
2.20.1



More information about the libcamera-devel mailing list