diff options
Diffstat (limited to '')
| -rw-r--r-- | test/run_output.cxx (renamed from test/run_output.c) | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/test/run_output.c b/test/run_output.cxx index bbb1be7d2..04374537e 100644 --- a/test/run_output.c +++ b/test/run_output.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,18 +18,21 @@ */ #include "config.h" -#include "io_thread.h" +#include "OutputControl.hxx" + +extern "C" { #include "output_plugin.h" #include "output_internal.h" -#include "output_control.h" +#include "io_thread.h" #include "conf.h" #include "audio_parser.h" #include "filter_registry.h" #include "pcm_convert.h" #include "event_pipe.h" #include "idle.h" -#include "playlist.h" -#include "player_control.h" +} + +#include "PlayerControl.hxx" #include "stdbin.h" #include <glib.h> @@ -39,8 +42,6 @@ #include <unistd.h> #include <stdlib.h> -struct playlist g_playlist; - void idle_add(G_GNUC_UNUSED unsigned flags) { @@ -94,6 +95,10 @@ find_named_config_block(const char *block, const char *name) return NULL; } +player_control::player_control(gcc_unused unsigned _buffer_chunks, + gcc_unused unsigned _buffered_before_play) {} +player_control::~player_control() {} + static struct audio_output * load_audio_output(const char *name) { @@ -103,10 +108,10 @@ load_audio_output(const char *name) param = find_named_config_block(CONF_AUDIO_OUTPUT, name); if (param == NULL) { g_printerr("No such configured audio output: %s\n", name); - return false; + return nullptr; } - static struct player_control dummy_player_control; + static struct player_control dummy_player_control(32, 4); struct audio_output *ao = audio_output_new(param, &dummy_player_control, &error); |