aboutsummaryrefslogtreecommitdiffstats
path: root/test/run_filter.cxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--test/run_filter.cxx20
1 files changed, 4 insertions, 16 deletions
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index ab99c9a1e..d743937d5 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "fs/Path.hxx"
#include "AudioParser.hxx"
@@ -33,10 +33,6 @@
#include "system/FatalError.hxx"
#include "Log.hxx"
-#ifdef HAVE_GLIB
-#include <glib.h>
-#endif
-
#include <assert.h>
#include <string.h>
#include <stdlib.h>
@@ -54,8 +50,8 @@ mixer_set_volume(gcc_unused Mixer *mixer,
static Filter *
load_filter(const char *name)
{
- const config_param *param =
- config_find_block(CONF_AUDIO_FILTER, "name", name);
+ const auto *param = config_find_block(ConfigBlockOption::AUDIO_FILTER,
+ "name", name);
if (param == NULL) {
fprintf(stderr, "No such configured filter: %s\n", name);
return nullptr;
@@ -86,14 +82,6 @@ int main(int argc, char **argv)
AudioFormat audio_format(44100, SampleFormat::S16, 2);
- /* initialize GLib */
-
-#ifdef HAVE_GLIB
-#if !GLIB_CHECK_VERSION(2,32,0)
- g_thread_init(NULL);
-#endif
-#endif
-
/* read configuration file (mpd.conf) */
config_global_init();