diff options
Diffstat (limited to '')
| -rw-r--r-- | src/OutputControl.cxx (renamed from src/output_control.c) | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/output_control.c b/src/OutputControl.cxx index 7b95be49b..13625ade2 100644 --- a/src/output_control.c +++ b/src/OutputControl.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,14 +18,19 @@ */ #include "config.h" -#include "output_control.h" +#include "OutputControl.hxx" +#include "OutputThread.hxx" + +extern "C" { #include "output_api.h" #include "output_internal.h" -#include "output_thread.h" #include "mixer_control.h" #include "mixer_plugin.h" +} + +#include "notify.hxx" +#include "filter/ReplayGainFilterPlugin.hxx" #include "filter_plugin.h" -#include "notify.h" #include <assert.h> #include <stdlib.h> @@ -47,7 +52,7 @@ static void ao_command_wait(struct audio_output *ao) { while (ao->command != AO_COMMAND_NONE) { g_mutex_unlock(ao->mutex); - notify_wait(&audio_output_client_notify); + audio_output_client_notify.Wait(); g_mutex_lock(ao->mutex); } } @@ -92,6 +97,14 @@ ao_lock_command(struct audio_output *ao, enum audio_output_command cmd) } void +audio_output_set_replay_gain_mode(struct audio_output *ao, + enum replay_gain_mode mode) +{ + if (ao->replay_gain_filter != NULL) + replay_gain_filter_set_mode(ao->replay_gain_filter, mode); +} + +void audio_output_enable(struct audio_output *ao) { if (ao->thread == NULL) { |