From b0f1307fcfbb95519cdf19ac63dfd650d3fe5256 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 17 Feb 2020 23:48:11 +0000 Subject: libcamera: media_device: Use Loggable interface Extend MediaDevice to inherit from the Loggable interface to support a logPrefix which presents the device node path, and the driver name. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/include/media_device.h | 6 +++++- src/libcamera/media_device.cpp | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h index 7b88e287..44a59e70 100644 --- a/src/libcamera/include/media_device.h +++ b/src/libcamera/include/media_device.h @@ -16,11 +16,12 @@ #include +#include "log.h" #include "media_object.h" namespace libcamera { -class MediaDevice +class MediaDevice : protected Loggable { public: MediaDevice(const std::string &deviceNode); @@ -52,6 +53,9 @@ public: Signal disconnected; +protected: + std::string logPrefix() const; + private: std::string driver_; std::string deviceNode_; diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 2c095566..0d6b5efd 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -75,6 +75,11 @@ MediaDevice::~MediaDevice() clear(); } +std::string MediaDevice::logPrefix() const +{ + return deviceNode() + "[" + driver() + "]"; +} + /** * \brief Claim a device for exclusive use * -- cgit v1.2.1