summaryrefslogtreecommitdiff
path: root/src/libcamera/media_device.cpp
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-01-21 17:53:28 +0100
committerJacopo Mondi <jacopo@jmondi.org>2019-01-22 14:14:04 +0100
commit1af83ca6df779fc3c7f8f4fc48f3ca82d824987d (patch)
tree7f5530f4ea838b04f23a07bb40c371c2f65e586a /src/libcamera/media_device.cpp
parentd18d25bde3064a537d4b080488941fffd61e1739 (diff)
libcamera: Global s/devnode/deviceNode rename
Do not use the abreviated version for members, variables and getter methods. Library-wise rename, no intended functional changes. Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/media_device.cpp')
-rw-r--r--src/libcamera/media_device.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp
index eb2e68bb..81c6a773 100644
--- a/src/libcamera/media_device.cpp
+++ b/src/libcamera/media_device.cpp
@@ -63,13 +63,13 @@ LOG_DEFINE_CATEGORY(MediaDevice)
/**
* \brief Construct a MediaDevice
- * \param devnode The media device node path
+ * \param deviceNode The media device node path
*
* Once constructed the media device is invalid, and must be opened and
* populated with open() and populate() before the media graph can be queried.
*/
-MediaDevice::MediaDevice(const std::string &devnode)
- : devnode_(devnode), fd_(-1), valid_(false), acquired_(false)
+MediaDevice::MediaDevice(const std::string &deviceNode)
+ : deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false)
{
}
@@ -145,12 +145,12 @@ int MediaDevice::open()
return -EBUSY;
}
- int ret = ::open(devnode_.c_str(), O_RDWR);
+ int ret = ::open(deviceNode_.c_str(), O_RDWR);
if (ret < 0) {
ret = -errno;
LOG(MediaDevice, Error)
<< "Failed to open media device at "
- << devnode_ << ": " << strerror(-ret);
+ << deviceNode_ << ": " << strerror(-ret);
return ret;
}
fd_ = ret;
@@ -285,9 +285,9 @@ int MediaDevice::populate()
*/
/**
- * \fn MediaDevice::devnode()
+ * \fn MediaDevice::deviceNode()
* \brief Retrieve the media device device node path
- * \return The MediaDevice devnode path
+ * \return The MediaDevice deviceNode path
*/
/**