From 5b9b3c38a11845da9d9ee3549a3c3866c0eb3e29 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Fri, 22 Mar 2019 10:58:26 +0100 Subject: 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 Signed-off-by: Jacopo Mondi --- test/v4l2_subdevice/list_formats.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/v4l2_subdevice') diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index bf859779..db486554 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -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; } -- cgit v1.2.1