tag_pool: use GStaticMutex

Eliminates explicit global initialisation.
This commit is contained in:
Max Kellermann
2012-08-08 21:01:25 +02:00
parent 510097cc37
commit c1f90a99f4
9 changed files with 24 additions and 49 deletions

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}