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

libcamera: v4l2_subdevice: Rename deviceName() method

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2019-03-22 10:58:26 +01:00
parent a20182310d
commit 5b9b3c38a1
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcamera/include/v4l2_subdevice.h
View file

@ -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);

4
src/libcamera/v4l2_subdevice.cpp
View file

@ -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,

6
test/v4l2_subdevice/list_formats.cpp
View file

@ -51,7 +51,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(0);
if (formats.empty()) {
cerr << "Failed to list formats on pad 0 of subdevice "
<< scaler_->deviceName() << endl;
<< scaler_->entityName() << endl;
return TestFail;
}
for (auto it = formats.begin(); it != formats.end(); ++it)
@ -60,7 +60,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(1);
if (formats.empty()) {
cerr << "Failed to list formats on pad 1 of subdevice "
<< scaler_->deviceName() << endl;
<< scaler_->entityName() << endl;
return TestFail;
}
for (auto it = formats.begin(); it != formats.end(); ++it)
@ -70,7 +70,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(2);
if (!formats.empty()) {
cerr << "Listing formats on non-existing pad 2 of subdevice "
<< scaler_->deviceName()
<< scaler_->entityName()
<< " should return an empty format list" << endl;
return TestFail;
}