diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2019-01-21 17:53:28 +0100 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2019-01-22 14:14:04 +0100 |
| commit | 1af83ca6df779fc3c7f8f4fc48f3ca82d824987d (patch) | |
| tree | 7f5530f4ea838b04f23a07bb40c371c2f65e586a /test/media_device | |
| parent | d18d25bde3064a537d4b080488941fffd61e1739 (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 'test/media_device')
| -rw-r--r-- | test/media_device/media_device_link_test.cpp | 2 | ||||
| -rw-r--r-- | test/media_device/media_device_print_test.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp index 2297e335..ac5b632f 100644 --- a/test/media_device/media_device_link_test.cpp +++ b/test/media_device/media_device_link_test.cpp @@ -55,7 +55,7 @@ class MediaDeviceLinkTest : public Test if (dev_->open()) { cerr << "Failed to open media device at " - << dev_->devnode() << endl; + << dev_->deviceNode() << endl; return TestFail; } diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 13af722a..3eef9739 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -35,7 +35,7 @@ protected: void cleanup() { } private: - int testMediaDevice(string devnode); + int testMediaDevice(string deviceNode); void printMediaGraph(const MediaDevice &media, ostream &os); void printLinkFlags(const MediaLink *link, ostream &os); @@ -68,7 +68,7 @@ void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os) */ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os) { - os << "\n" << media.driver() << " - " << media.devnode() << "\n\n"; + os << "\n" << media.driver() << " - " << media.deviceNode() << "\n\n"; for (auto const &entity : media.entities()) { os << "\"" << entity->name() << "\"\n"; @@ -108,9 +108,9 @@ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os } /* Test a single media device. */ -int MediaDevicePrintTest::testMediaDevice(const string devnode) +int MediaDevicePrintTest::testMediaDevice(const string deviceNode) { - MediaDevice dev(devnode); + MediaDevice dev(deviceNode); int ret; /* Fuzzy open/close sequence. */ @@ -144,7 +144,7 @@ int MediaDevicePrintTest::testMediaDevice(const string devnode) #define MAX_MEDIA_DEV 256 int MediaDevicePrintTest::run() { - const string devnode("/dev/media"); + const string deviceNode("/dev/media"); unsigned int i; int ret = 77; /* skip test exit code */ @@ -153,7 +153,7 @@ int MediaDevicePrintTest::run() * system, if any. */ for (i = 0; i < MAX_MEDIA_DEV; i++) { - string mediadev = devnode + to_string(i); + string mediadev = deviceNode + to_string(i); struct stat pstat = { }; if (stat(mediadev.c_str(), &pstat)) |