From 8b8ae521347f293380f471285193aebbb3279f7d Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 20 Jan 2019 15:03:01 +0200
Subject: libcamera: Use log categories

Use log categories in the whole existing code base.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/device_enumerator.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/libcamera/device_enumerator.cpp')

diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp
index 55c510e3..22d4edee 100644
--- a/src/libcamera/device_enumerator.cpp
+++ b/src/libcamera/device_enumerator.cpp
@@ -42,6 +42,8 @@
 
 namespace libcamera {
 
+LOG_DEFINE_CATEGORY(DeviceEnumerator)
+
 /**
  * \class DeviceMatch
  * \brief Description of a media device search pattern
@@ -155,7 +157,8 @@ DeviceEnumerator::~DeviceEnumerator()
 {
 	for (MediaDevice *dev : devices_) {
 		if (dev->busy())
-			LOG(Error) << "Removing media device while still in use";
+			LOG(DeviceEnumerator, Error)
+				<< "Removing media device while still in use";
 
 		delete dev;
 	}
@@ -205,13 +208,15 @@ int DeviceEnumerator::addDevice(const std::string &devnode)
 
 	ret = media->populate();
 	if (ret < 0) {
-		LOG(Info) << "Unable to populate media device " << devnode <<
-			  " (" << strerror(-ret) << "), skipping";
+		LOG(DeviceEnumerator, Info)
+			<< "Unable to populate media device " << devnode
+			<< " (" << strerror(-ret) << "), skipping";
 		return ret;
 	}
 
-	LOG(Debug) << "New media device \"" << media->driver()
-		   << "\" created from " << devnode;
+	LOG(DeviceEnumerator, Debug)
+		<< "New media device \"" << media->driver()
+		<< "\" created from " << devnode;
 
 	/* Associate entities to device node paths. */
 	for (MediaEntity *entity : media->entities()) {
@@ -251,8 +256,9 @@ MediaDevice *DeviceEnumerator::search(const DeviceMatch &dm)
 			continue;
 
 		if (dm.match(dev)) {
-			LOG(Debug) << "Successful match for media device \""
-				   << dev->driver() << "\"";
+			LOG(DeviceEnumerator, Debug)
+				<< "Successful match for media device \""
+				<< dev->driver() << "\"";
 			return dev;
 		}
 	}
@@ -330,8 +336,9 @@ int DeviceEnumeratorUdev::enumerate()
 
 		dev = udev_device_new_from_syspath(udev_, syspath);
 		if (!dev) {
-			LOG(Warning) << "Failed to get device for '" <<
-				syspath << "', skipping";
+			LOG(DeviceEnumerator, Warning)
+				<< "Failed to get device for '"
+				<< syspath << "', skipping";
 			continue;
 		}
 
-- 
cgit v1.2.1