From d8db46edfaed14c38d97e8880ff07fc629908b2d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 17 Feb 2009 08:51:34 +0100
Subject: decoders: added and fixed GLib log domains

Fixed the log domains of the renamed decoders.  Added G_LOG_DOMAIN
macros in decoders which don't have one already.
---
 src/decoder/faad_plugin.c   | 4 ++--
 src/decoder/mad_plugin.c    | 8 +++++---
 src/decoder/mikmod_plugin.c | 5 ++++-
 src/decoder/mp4ff_plugin.c  | 5 ++++-
 src/decoder/mpcdec_plugin.c | 6 ++++--
 src/decoder/vorbis_plugin.c | 3 +++
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c
index a8e4a6045..68198d53f 100644
--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 
 #undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "aac"
+#define G_LOG_DOMAIN "faad"
 
 /* all code here is either based on or copied from FAAD2's frontend code */
 struct faad_buffer {
@@ -402,7 +402,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
 			};
 
 			if (!audio_format_valid(&audio_format)) {
-				g_warning("aac: invalid audio format\n");
+				g_warning("invalid audio format\n");
 				break;
 			}
 
diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_plugin.c
index 71d72bd12..5b5f8ba42 100644
--- a/src/decoder/mad_plugin.c
+++ b/src/decoder/mad_plugin.c
@@ -32,6 +32,9 @@
 #include <id3tag.h>
 #endif
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "mad"
+
 #define FRAMES_CUSHION    2000
 
 #define READ_BUFFER_SIZE  40960
@@ -378,7 +381,7 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
 		}
 
 		if (count != tagsize) {
-			g_debug("mp3_decode: error parsing ID3 tag\n");
+			g_debug("error parsing ID3 tag");
 			g_free(allocated);
 			return;
 		}
@@ -1195,8 +1198,7 @@ static struct tag *mp3_tag_dup(const char *file)
 
 	total_time = mp3_total_file_time(file);
 	if (total_time < 0) {
-		g_debug("mp3_tag_dup: Failed to get total song time from: %s\n",
-			file);
+		g_debug("Failed to get total song time from: %s", file);
 		return NULL;
 	}
 
diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_plugin.c
index af715c0ca..7ba8ab3f7 100644
--- a/src/decoder/mikmod_plugin.c
+++ b/src/decoder/mikmod_plugin.c
@@ -21,6 +21,9 @@
 #include <glib.h>
 #include <mikmod.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "mikmod"
+
 /* this is largely copied from alsaplayer */
 
 #define MIKMOD_FRAME_SIZE	4096
@@ -204,7 +207,7 @@ static struct tag *modTagDup(const char *file)
 	g_free(path2);
 
 	if (moduleHandle == NULL) {
-		g_debug("modTagDup: Failed to open file: %s\n", file);
+		g_debug("Failed to open file: %s", file);
 		return NULL;
 
 	}
diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_plugin.c
index 3d5a022a0..d2734207f 100644
--- a/src/decoder/mp4ff_plugin.c
+++ b/src/decoder/mp4ff_plugin.c
@@ -27,6 +27,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "mp4ff"
+
 /* all code here is either based on or copied from FAAD2's frontend code */
 
 struct mp4_context {
@@ -340,7 +343,7 @@ mp4_load_tag(const char *file)
 	int i;
 
 	if (!input_stream_open(&input_stream, file)) {
-		g_warning("mp4_load_tag: Failed to open file: %s\n", file);
+		g_warning("Failed to open file: %s", file);
 		return NULL;
 	}
 
diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_plugin.c
index c84dfca9b..fa07b81d8 100644
--- a/src/decoder/mpcdec_plugin.c
+++ b/src/decoder/mpcdec_plugin.c
@@ -23,6 +23,9 @@
 #include <glib.h>
 #include <unistd.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "mpcdec"
+
 typedef struct _MpcCallbackData {
 	struct input_stream *inStream;
 	struct decoder *decoder;
@@ -253,8 +256,7 @@ static struct tag *mpcTagDup(const char *file)
 	struct tag *tag;
 
 	if (total_time < 0) {
-		g_debug("mpcTagDup: Failed to get Songlength of file: %s\n",
-			file);
+		g_debug("Failed to get duration of file: %s", file);
 		return NULL;
 	}
 
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index 526824cfc..982165783 100644
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -44,6 +44,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "vorbis"
+
 #if G_BYTE_ORDER == G_BIG_ENDIAN
 #define OGG_DECODE_USE_BIGENDIAN	1
 #else
-- 
cgit v1.2.3