tag_pool: use GStaticMutex

Eliminates explicit global initialisation.

5 files changed, 2 insertions, 17 deletions

diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index b0a9c933..7aa8f06f 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -27,7 +27,7 @@
 
 extern "C" {
 #include "conf.h"
-#include "tag_pool.h"
+#include "tag.h"
 }
 
 #include <iostream>
@@ -95,7 +95,6 @@ main(int argc, char **argv)
 
 	/* initialize MPD */
 
-	tag_pool_init();
 	config_global_init();
 
 	if (!config_read_file(config_path, &error)) {
@@ -147,7 +146,6 @@ main(int argc, char **argv)
 	/* deinitialize everything */
 
 	config_global_finish();
-	tag_pool_deinit();
 
 	return EXIT_SUCCESS;
 }
diff --git a/test/dump_playlist.c b/test/dump_playlist.c
index 0570f6e4..28237a79 100644
--- a/test/dump_playlist.c
+++ b/test/dump_playlist.c
@@ -21,7 +21,6 @@
 #include "io_thread.h"
 #include "input_init.h"
 #include "input_stream.h"
-#include "tag_pool.h"
 #include "tag_save.h"
 #include "conf.h"
 #include "song.h"
@@ -157,7 +156,6 @@ int main(int argc, char **argv)
 
 	/* initialize MPD */
 
-	tag_pool_init();
 	config_global_init();
 	success = config_read_file(argv[1], &error);
 	if (!success) {
@@ -249,7 +247,6 @@ int main(int argc, char **argv)
 	input_stream_global_finish();
 	io_thread_deinit();
 	config_global_finish();
-	tag_pool_deinit();
 
 	return 0;
 }
diff --git a/test/dump_text_file.c b/test/dump_text_file.c
index f1437144..f13e648b 100644
--- a/test/dump_text_file.c
+++ b/test/dump_text_file.c
@@ -22,7 +22,6 @@
 #include "input_init.h"
 #include "input_stream.h"
 #include "text_input_stream.h"
-#include "tag_pool.h"
 #include "conf.h"
 #include "stdbin.h"
 
@@ -112,7 +111,6 @@ int main(int argc, char **argv)
 
 	/* initialize MPD */
 
-	tag_pool_init();
 	config_global_init();
 
 	io_thread_init();
@@ -164,7 +162,6 @@ int main(int argc, char **argv)
 	io_thread_deinit();
 
 	config_global_finish();
-	tag_pool_deinit();
 
 	return ret;
 }
diff --git a/test/run_decoder.c b/test/run_decoder.c
index e6712c75..c25e727b 100644
--- a/test/run_decoder.c
+++ b/test/run_decoder.c
@@ -21,7 +21,6 @@
 #include "io_thread.h"
 #include "decoder_list.h"
 #include "decoder_api.h"
-#include "tag_pool.h"
 #include "input_init.h"
 #include "input_stream.h"
 #include "audio_format.h"
@@ -191,8 +190,6 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	tag_pool_init();
-
 	if (!input_stream_global_init(&error)) {
 		g_warning("%s", error->message);
 		g_error_free(error);
@@ -248,7 +245,5 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	tag_pool_deinit();
-
 	return 0;
 }
diff --git a/test/run_input.c b/test/run_input.c
index 676e4e61..acf25a28 100644
--- a/test/run_input.c
+++ b/test/run_input.c
@@ -21,8 +21,8 @@
 #include "io_thread.h"
 #include "input_init.h"
 #include "input_stream.h"
-#include "tag_pool.h"
 #include "tag_save.h"
+#include "tag.h"
 #include "conf.h"
 #include "stdbin.h"
 
@@ -127,7 +127,6 @@ int main(int argc, char **argv)
 
 	/* initialize MPD */
 
-	tag_pool_init();
 	config_global_init();
 
 	io_thread_init();
@@ -179,7 +178,6 @@ int main(int argc, char **argv)
 	io_thread_deinit();
 
 	config_global_finish();
-	tag_pool_deinit();
 
 	return ret;
 }