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

libcamera: Global s/devnode/deviceNode rename

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2019-01-21 17:53:28 +01:00
parent d18d25bde3
commit 1af83ca6df
11 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libcamera/v4l2_device.cpp
View file

@ -88,10 +88,10 @@ LOG_DEFINE_CATEGORY(V4L2)
/**
* \brief Construct a V4L2Device
* \param devnode The file-system path to the video device node
* \param deviceNode The file-system path to the video device node
*/
V4L2Device::V4L2Device(const std::string &devnode)
: devnode_(devnode), fd_(-1)
V4L2Device::V4L2Device(const std::string &deviceNode)
: deviceNode_(deviceNode), fd_(-1)
{
}
@ -102,7 +102,7 @@ V4L2Device::V4L2Device(const std::string &devnode)
* Construct a V4L2Device from a MediaEntity's device node path.
*/
V4L2Device::V4L2Device(const MediaEntity &entity)
: V4L2Device(entity.devnode())
: V4L2Device(entity.deviceNode())
{
}
@ -124,11 +124,11 @@ int V4L2Device::open()
return -EBUSY;
}
ret = ::open(devnode_.c_str(), O_RDWR);
ret = ::open(deviceNode_.c_str(), O_RDWR);
if (ret < 0) {
ret = -errno;
LOG(V4L2, Error)
<< "Failed to open V4L2 device '" << devnode_
<< "Failed to open V4L2 device '" << deviceNode_
<< "': " << strerror(-ret);
return ret;
}
@ -144,7 +144,7 @@ int V4L2Device::open()
}
LOG(V4L2, Debug)
<< "Opened '" << devnode_ << "' "
<< "Opened '" << deviceNode_ << "' "
<< caps_.bus_info() << ": " << caps_.driver()
<< ": " << caps_.card();