diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-08 21:01:25 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-08 21:01:25 +0200 |
| commit | c1f90a99f4b33b3b2c05d051f19bd7ed3472c5ff (patch) | |
| tree | a1eb2e93ff43309ee30fd77ec57db6d10d8fd612 /test | |
| parent | 510097cc37ffe88ddd1bf0587add83654777ded1 (diff) | |
| download | mpd-c1f90a99f4b33b3b2c05d051f19bd7ed3472c5ff.tar.gz mpd-c1f90a99f4b33b3b2c05d051f19bd7ed3472c5ff.tar.xz mpd-c1f90a99f4b33b3b2c05d051f19bd7ed3472c5ff.zip | |
tag_pool: use GStaticMutex
Eliminates explicit global initialisation.
Diffstat (limited to 'test')
| -rw-r--r-- | test/DumpDatabase.cxx | 4 | ||||
| -rw-r--r-- | test/dump_playlist.c | 3 | ||||
| -rw-r--r-- | test/dump_text_file.c | 3 | ||||
| -rw-r--r-- | test/run_decoder.c | 5 | ||||
| -rw-r--r-- | test/run_input.c | 4 |
5 files changed, 2 insertions, 17 deletions
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index b0a9c933c..7aa8f06f5 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 0570f6e49..28237a799 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 f14371441..f13e648b2 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 e6712c75b..c25e727ba 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 676e4e618..acf25a283 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; } |