oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/{DumpDatabase,run_neighbor_explorer}: add class GlobalInit

Browse Source
This commit is contained in:
Max Kellermann 2017-08-18 14:19:03 +02:00
parent b7d0890bc0
commit 9033f07724
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/DumpDatabase.cxx
View File

@ -43,6 +43,17 @@ using std::endl;
#include <stdlib.h> #include <stdlib.h>
class GlobalInit {
public:
GlobalInit() {
config_global_init();
}
~GlobalInit() {
config_global_finish();
}
};
#ifdef ENABLE_UPNP #ifdef ENABLE_UPNP
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
size_t size_t
@ -104,8 +115,7 @@ try {
/* initialize MPD */ /* initialize MPD */
config_global_init(); GlobalInit init;
AtScopeExit() { config_global_finish(); };
ReadConfigFile(config_path); ReadConfigFile(config_path);

21
test/run_neighbor_explorer.cxx
View File

@ -29,6 +29,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
class GlobalInit {
public:
GlobalInit() {
config_global_init();
}
~GlobalInit() {
config_global_finish();
}
};
class MyNeighborListener final : public NeighborListener { class MyNeighborListener final : public NeighborListener {
public: public:
/* virtual methods from class NeighborListener */ /* virtual methods from class NeighborListener */
@ -53,15 +64,15 @@ try {
const Path config_path = Path::FromFS(argv[1]); const Path config_path = Path::FromFS(argv[1]);
/* read configuration file (mpd.conf) */
config_global_init();
ReadConfigFile(config_path);
/* initialize the core */ /* initialize the core */
GlobalInit init;
EventLoop loop; EventLoop loop;
/* read configuration file (mpd.conf) */
ReadConfigFile(config_path);
/* initialize neighbor plugins */ /* initialize neighbor plugins */
MyNeighborListener listener; MyNeighborListener listener;