From 060814daa83f6a94f5934464ae42a406c5c7e947 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 27 Sep 2013 22:31:24 +0200
Subject: Log: new logging library API

Prepare to migrate away from GLib.  Currently, we're still using GLib
as a backend.
---
 src/pcm/PcmConvert.cxx               |  3 ---
 src/pcm/PcmResampleLibsamplerate.cxx | 14 +++++++-------
 src/pcm/PcmVolume.cxx                |  3 ---
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/pcm')

diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 38672810e..4260ccb0f 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -31,9 +31,6 @@
 #include <assert.h>
 #include <math.h>
 
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "pcm"
-
 const Domain pcm_convert_domain("pcm_convert");
 
 PcmConvert::PcmConvert()
diff --git a/src/pcm/PcmResampleLibsamplerate.cxx b/src/pcm/PcmResampleLibsamplerate.cxx
index 1ab9b1953..2ffe4b8c4 100644
--- a/src/pcm/PcmResampleLibsamplerate.cxx
+++ b/src/pcm/PcmResampleLibsamplerate.cxx
@@ -21,6 +21,7 @@
 #include "PcmResampleInternal.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
+#include "Log.hxx"
 
 #include <glib.h>
 
@@ -28,9 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "pcm"
-
 static int lsr_converter = SRC_SINC_FASTEST;
 
 static constexpr Domain libsamplerate_domain("libsamplerate");
@@ -74,8 +72,9 @@ pcm_resample_lsr_global_init(const char *converter, Error &error)
 		return false;
 	}
 
-	g_debug("libsamplerate converter '%s'",
-		src_get_name(lsr_converter));
+	FormatDebug(libsamplerate_domain,
+		    "libsamplerate converter '%s'",
+		    src_get_name(lsr_converter));
 
 	return true;
 }
@@ -133,8 +132,9 @@ pcm_resample_set(PcmResampler *state,
 
 	SRC_DATA *data = &state->data;
 	data->src_ratio = (double)dest_rate / (double)src_rate;
-	g_debug("setting samplerate conversion ratio to %.2lf",
-		data->src_ratio);
+	FormatDebug(libsamplerate_domain,
+		    "setting samplerate conversion ratio to %.2lf",
+		    data->src_ratio);
 	src_set_ratio(state->state, data->src_ratio);
 
 	return true;
diff --git a/src/pcm/PcmVolume.cxx b/src/pcm/PcmVolume.cxx
index ff505e29d..05ab73c68 100644
--- a/src/pcm/PcmVolume.cxx
+++ b/src/pcm/PcmVolume.cxx
@@ -27,9 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "pcm_volume"
-
 static void
 pcm_volume_change_8(int8_t *buffer, const int8_t *end, int volume)
 {
-- 
cgit v1.2.3