diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2019-03-22 10:58:26 +0100 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2019-04-02 11:02:38 +0200 |
| commit | 5b9b3c38a11845da9d9ee3549a3c3866c0eb3e29 (patch) | |
| tree | b72d9ff30dcff434d659ba976870b1e0226de85e /src | |
| parent | a20182310dc7d2ad56cf208269a05206580a9a94 (diff) | |
libcamera: v4l2_subdevice: Rename deviceName() method
Rename the 'deviceName()' method to 'entityName()' as it actually
returns the name of the entity backing the v4l2 subdevice.
While at it, make the names getter methods return a const reference
instead of returning by copy.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcamera/include/v4l2_subdevice.h | 4 | ||||
| -rw-r--r-- | src/libcamera/v4l2_subdevice.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h index 3ecf0851..f42cccab 100644 --- a/src/libcamera/include/v4l2_subdevice.h +++ b/src/libcamera/include/v4l2_subdevice.h @@ -37,8 +37,8 @@ public: bool isOpen() const; void close(); - std::string deviceNode() const { return entity_->deviceNode(); } - std::string deviceName() const { return entity_->name(); } + const std::string &deviceNode() const { return entity_->deviceNode(); } + const std::string &entityName() const { return entity_->name(); } int setCrop(unsigned int pad, Rectangle *rect); int setCompose(unsigned int pad, Rectangle *rect); diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 8260e6eb..10925f9f 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -166,7 +166,7 @@ void V4L2Subdevice::close() */ /** - * \fn V4L2Subdevice::deviceName() + * \fn V4L2Subdevice::entityName() * \brief Retrieve the name of the media entity associated with the subdevice * * \return The name of the media entity the subdevice is associated to @@ -315,7 +315,7 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format) std::string V4L2Subdevice::logPrefix() const { - return "'" + deviceName() + "'"; + return "'" + entityName() + "'"; } int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code, |