diff options
Diffstat (limited to '')
| -rw-r--r-- | test/read_mixer.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 83a1d26b4..2d68aab09 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.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 @@ -24,14 +24,10 @@ #include "pcm/Volume.hxx" #include "Main.hxx" #include "event/Loop.hxx" -#include "config/ConfigData.hxx" +#include "config/Block.hxx" #include "util/Error.hxx" #include "Log.hxx" -#ifdef HAVE_GLIB -#include <glib.h> -#endif - #include <assert.h> #include <string.h> #include <unistd.h> @@ -53,19 +49,13 @@ int main(int argc, gcc_unused char **argv) return EXIT_FAILURE; } -#ifdef HAVE_GLIB -#if !GLIB_CHECK_VERSION(2,32,0) - g_thread_init(NULL); -#endif -#endif - EventLoop event_loop; Error error; Mixer *mixer = mixer_new(event_loop, alsa_mixer_plugin, *(AudioOutput *)nullptr, *(MixerListener *)nullptr, - config_param(), error); + ConfigBlock(), error); if (mixer == NULL) { LogError(error, "mixer_new() failed"); return EXIT_FAILURE; |