From 21aad77c9ca07f4271136b9241f5adb00a6bb908 Mon Sep 17 00:00:00 2001
From: Andrej Rode <andrej.rode@ettus.com>
Date: Tue, 7 Feb 2017 16:37:25 -0800
Subject: utils: introduce new logging API and remove msg API

---
 host/lib/convert/convert_fc32_item32.cpp |  2 +-
 host/lib/convert/convert_impl.cpp        | 16 +++++-----------
 host/lib/convert/convert_pack_sc12.cpp   |  2 +-
 host/lib/convert/convert_unpack_sc12.cpp |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'host/lib/convert')

diff --git a/host/lib/convert/convert_fc32_item32.cpp b/host/lib/convert/convert_fc32_item32.cpp
index 4a188780a..38f71a62b 100644
--- a/host/lib/convert/convert_fc32_item32.cpp
+++ b/host/lib/convert/convert_fc32_item32.cpp
@@ -17,7 +17,7 @@
 
 #include "convert_common.hpp"
 #include <uhd/utils/byteswap.hpp>
-#include <uhd/utils/msg.hpp>
+#include <uhd/utils/log.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <vector>
 
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp
index 9508e7984..33f88d70b 100644
--- a/host/lib/convert/convert_impl.cpp
+++ b/host/lib/convert/convert_impl.cpp
@@ -80,10 +80,7 @@ void uhd::convert::register_converter(
     get_table()[id][prio] = fcn;
 
     //----------------------------------------------------------------//
-    UHD_LOGV(always) << "register_converter: " << id.to_pp_string() << std::endl
-        << "    prio: " << prio << std::endl
-        << std::endl
-    ;
+    UHD_LOG_TRACE("CONVERT", boost::format("register_converter: %s prio: %s") % id.to_string() % prio)
     //----------------------------------------------------------------//
 }
 
@@ -102,9 +99,8 @@ convert::function_type convert::get_converter(
     for(priority_type prio_i:  get_table()[id].keys()){
         if (prio_i == prio) {
             //----------------------------------------------------------------//
-            UHD_LOGV(always) << "get_converter: For converter ID: " << id.to_pp_string() << std::endl
-                << "Using prio: " << prio << std::endl
-                << std::endl
+            UHD_LOGGER_DEBUG("CONVERT") << "get_converter: For converter ID: " << id.to_pp_string()
+                                        << " Using prio: " << prio;
             ;
             //----------------------------------------------------------------//
             return get_table()[id][prio];
@@ -117,10 +113,8 @@ convert::function_type convert::get_converter(
         "Cannot find a conversion routine [with prio] for " + id.to_pp_string());
 
     //----------------------------------------------------------------//
-    UHD_LOGV(always) << "get_converter: For converter ID: " << id.to_pp_string() << std::endl
-        << "Using prio: " << best_prio << std::endl
-        << std::endl
-    ;
+    UHD_LOGGER_DEBUG("CONVERT") << "get_converter: For converter ID: " << id.to_pp_string()
+                                << " Using prio: " << best_prio;
     //----------------------------------------------------------------//
 
     //otherwise, return best prio
diff --git a/host/lib/convert/convert_pack_sc12.cpp b/host/lib/convert/convert_pack_sc12.cpp
index fd32fc95f..aaa6f2632 100644
--- a/host/lib/convert/convert_pack_sc12.cpp
+++ b/host/lib/convert/convert_pack_sc12.cpp
@@ -17,7 +17,7 @@
 
 #include "convert_common.hpp"
 #include <uhd/utils/byteswap.hpp>
-#include <uhd/utils/msg.hpp>
+#include <uhd/utils/log.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <vector>
 
diff --git a/host/lib/convert/convert_unpack_sc12.cpp b/host/lib/convert/convert_unpack_sc12.cpp
index acc815951..f42e51c00 100644
--- a/host/lib/convert/convert_unpack_sc12.cpp
+++ b/host/lib/convert/convert_unpack_sc12.cpp
@@ -17,7 +17,7 @@
 
 #include "convert_common.hpp"
 #include <uhd/utils/byteswap.hpp>
-#include <uhd/utils/msg.hpp>
+#include <uhd/utils/log.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <vector>
 
-- 
cgit v1.2.3