From 5b410e637ccca375ca1b8aa95f68de3130689c38 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Oct 2016 10:16:03 +0200
Subject: make libmagic initialization global

---
 mpd-notification.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/mpd-notification.c b/mpd-notification.c
index 681e454..c4e6d25 100644
--- a/mpd-notification.c
+++ b/mpd-notification.c
@@ -31,6 +31,9 @@ struct mpd_connection * conn = NULL;
 uint8_t doexit = 0;
 uint8_t verbose = 0;
 uint8_t oneline = 0;
+#ifdef HAVE_LIBAV
+	magic_t magic = NULL;
+#endif
 
 /*** received_signal ***/
 void received_signal(int signal) {
@@ -71,7 +74,6 @@ GdkPixbuf * retrieve_artwork(const char * music_dir, const char * uri) {
 
 #ifdef HAVE_LIBAV
 	int i;
-	magic_t magic = NULL;
 	const char *magic_mime;
 	AVFormatContext * pFormatCtx = NULL;
 	GdkPixbufLoader * loader;
@@ -80,17 +82,6 @@ GdkPixbuf * retrieve_artwork(const char * music_dir, const char * uri) {
 	uri_path = malloc(strlen(music_dir) + strlen(uri) + 2);
 	sprintf(uri_path, "%s/%s", music_dir, uri);
 
-	if ((magic = magic_open(MAGIC_MIME_TYPE)) == NULL) {
-		fprintf(stderr, "%s: unable to initialize magic library\n", program);
-		goto image;
-	}
-
-	if (magic_load(magic, NULL) != 0) {
-		fprintf(stderr, "%s: cannot load magic database: %s\n", program, magic_error(magic));
-		magic_close(magic);
-		goto image;
-	}
-
 	if ((magic_mime = magic_file(magic, uri_path)) == NULL) {
 		fprintf(stderr, "%s: We did not get a MIME type...\n", program);
 		goto image;
@@ -175,11 +166,6 @@ fail:
 		avformat_free_context(pFormatCtx);
 	}
 
-#ifdef HAVE_LIBAV
-	if (magic != NULL)
-		magic_close(magic);
-#endif
-
 	free(uri_path);
 
 	return pixbuf;
@@ -326,6 +312,17 @@ int main(int argc, char ** argv) {
 	/* only fatal messages from libav */
 	if (verbose == 0)
 		av_log_set_level(AV_LOG_FATAL);
+
+	if ((magic = magic_open(MAGIC_MIME_TYPE)) == NULL) {
+		fprintf(stderr, "%s: unable to initialize magic library\n", program);
+		goto fail;
+	}
+
+	if (magic_load(magic, NULL) != 0) {
+		fprintf(stderr, "%s: cannot load magic database: %s\n", program, magic_error(magic));
+		magic_close(magic);
+		goto fail;
+	}
 #endif
 
 	conn = mpd_connection_new(mpd_host, mpd_port, mpd_timeout);
@@ -472,6 +469,12 @@ nonotification:
 	if (verbose > 0)
 		printf("%s: Exiting...\n", program);
 
+fail:
+#ifdef HAVE_LIBAV
+	if (magic != NULL)
+		magic_close(magic);
+#endif
+
 	mpd_connection_free(conn);
 
 	g_object_unref(G_OBJECT(notification));
-- 
cgit v1.2.3-54-g00ecf