Log: new logging library API

Prepare to migrate away from GLib.  Currently, we're still using GLib
as a backend.

1 files changed, 26 insertions, 22 deletions

diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx
index b7d90892b..1cce24f31 100644
--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -27,6 +27,8 @@
 #include "tag/TagHandler.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"
+#include "util/Domain.hxx"
+#include "Log.hxx"
 
 #include <assert.h>
 #include <unistd.h>
@@ -40,9 +42,6 @@
 #include <id3tag.h>
 #endif
 
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "mad"
-
 #define FRAMES_CUSHION    2000
 
 #define READ_BUFFER_SIZE  40960
@@ -65,6 +64,8 @@ enum muteframe {
 
 #define DEFAULT_GAPLESS_MP3_PLAYBACK true
 
+static constexpr Domain mad_domain("mad");
+
 static bool gapless_playback;
 
 static inline int32_t
@@ -367,7 +368,7 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
 		}
 
 		if (count != tagsize) {
-			g_debug("error parsing ID3 tag");
+			LogDebug(mad_domain, "error parsing ID3 tag");
 			g_free(allocated);
 			return;
 		}
@@ -482,9 +483,9 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag)
 			if (stream.error == MAD_ERROR_BUFLEN)
 				return DECODE_CONT;
 			else {
-				g_warning("unrecoverable frame level error "
-					  "(%s).\n",
-					  mad_stream_errorstr(&stream));
+				FormatWarning(mad_domain,
+					      "unrecoverable frame level error: %s",
+					      mad_stream_errorstr(&stream));
 				return DECODE_BREAK;
 			}
 		}
@@ -529,9 +530,9 @@ MadDecoder::DecodeNextFrame()
 			if (stream.error == MAD_ERROR_BUFLEN)
 				return DECODE_CONT;
 			else {
-				g_warning("unrecoverable frame level error "
-					  "(%s).\n",
-					  mad_stream_errorstr(&stream));
+				FormatWarning(mad_domain,
+					      "unrecoverable frame level error: %s",
+					      mad_stream_errorstr(&stream));
 				return DECODE_BREAK;
 			}
 		}
@@ -702,8 +703,8 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 	           &lame->version.major, &lame->version.minor) != 2)
 		return false;
 
-	g_debug("detected LAME version %i.%i (\"%s\")\n",
-		lame->version.major, lame->version.minor, lame->encoder);
+	FormatDebug(mad_domain, "detected LAME version %i.%i (\"%s\")",
+		    lame->version.major, lame->version.minor, lame->encoder);
 
 	/* The reference volume was changed from the 83dB used in the
 	 * ReplayGain spec to 89dB in lame 3.95.1.  Bump the gain for older
@@ -719,7 +720,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 	mad_bit_read(ptr, 16);
 
 	lame->peak = mad_f_todouble(mad_bit_read(ptr, 32) << 5); /* peak */
-	g_debug("LAME peak found: %f\n", lame->peak);
+	FormatDebug(mad_domain, "LAME peak found: %f", lame->peak);
 
 	lame->track_gain = 0;
 	name = mad_bit_read(ptr, 3); /* gain name */
@@ -728,7 +729,8 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 	gain = mad_bit_read(ptr, 9); /* gain*10 */
 	if (gain && name == 1 && orig != 0) {
 		lame->track_gain = ((sign ? -gain : gain) / 10.0) + adj;
-		g_debug("LAME track gain found: %f\n", lame->track_gain);
+		FormatDebug(mad_domain, "LAME track gain found: %f",
+			    lame->track_gain);
 	}
 
 	/* tmz reports that this isn't currently written by any version of lame
@@ -743,7 +745,8 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 	gain = mad_bit_read(ptr, 9); /* gain*10 */
 	if (gain && name == 2 && orig != 0) {
 		lame->album_gain = ((sign ? -gain : gain) / 10.0) + adj;
-		g_debug("LAME album gain found: %f\n", lame->track_gain);
+		FormatDebug(mad_domain, "LAME album gain found: %f",
+			    lame->track_gain);
 	}
 #else
 	mad_bit_read(ptr, 16);
@@ -754,8 +757,8 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 	lame->encoder_delay = mad_bit_read(ptr, 12);
 	lame->encoder_padding = mad_bit_read(ptr, 12);
 
-	g_debug("encoder delay is %i, encoder padding is %i\n",
-	      lame->encoder_delay, lame->encoder_padding);
+	FormatDebug(mad_domain, "encoder delay is %i, encoder padding is %i",
+		    lame->encoder_delay, lame->encoder_padding);
 
 	mad_bit_read(ptr, 80);
 
@@ -880,8 +883,9 @@ MadDecoder::DecodeFirstFrame(Tag **tag)
 		return false;
 
 	if (max_frames > 8 * 1024 * 1024) {
-		g_warning("mp3 file header indicates too many frames: %lu\n",
-			  max_frames);
+		FormatWarning(mad_domain,
+			      "mp3 file header indicates too many frames: %lu",
+			      max_frames);
 		return false;
 	}
 
@@ -1120,8 +1124,8 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
 		delete tag;
 
 		if (decoder_get_command(decoder) == DecoderCommand::NONE)
-			g_warning
-			    ("Input does not appear to be a mp3 bit stream.\n");
+			LogError(mad_domain,
+				 "Input does not appear to be a mp3 bit stream");
 		return;
 	}
 
@@ -1132,7 +1136,7 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
 				       SampleFormat::S24_P32,
 				       MAD_NCHANNELS(&data.frame.header),
 				       error)) {
-		g_warning("%s", error.GetMessage());
+		LogError(error);
 		delete tag;
 		return;
 	}