diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-31 21:00:43 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-31 21:11:06 +0100 |
| commit | 776413621165605b943248499e2a5a6662fb1a3b (patch) | |
| tree | 68ec7eb1de864f74eda4526391effde1b7e1a75f /src/mixer | |
| parent | 0307801d5164b3119a0da6eec83e9616665e6511 (diff) | |
mixer/software, filter/volume: convert to C++
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/SoftwareMixerPlugin.cxx (renamed from src/mixer/software_mixer_plugin.c) | 18 | ||||
| -rw-r--r-- | src/mixer/SoftwareMixerPlugin.hxx (renamed from src/mixer/software_mixer_plugin.h) | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/mixer/software_mixer_plugin.c b/src/mixer/SoftwareMixerPlugin.cxx index 0206c3b99..45f564c9d 100644 --- a/src/mixer/software_mixer_plugin.c +++ b/src/mixer/SoftwareMixerPlugin.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,11 +18,11 @@ */ #include "config.h" -#include "software_mixer_plugin.h" +#include "SoftwareMixerPlugin.hxx" #include "mixer_api.h" #include "filter_plugin.h" #include "filter_registry.h" -#include "filter/volume_filter_plugin.h" +#include "filter/VolumeFilterPlugin.hxx" #include "pcm_volume.h" #include <assert.h> @@ -91,11 +91,13 @@ software_mixer_set_volume(struct mixer *mixer, unsigned volume, } const struct mixer_plugin software_mixer_plugin = { - .init = software_mixer_init, - .finish = software_mixer_finish, - .get_volume = software_mixer_get_volume, - .set_volume = software_mixer_set_volume, - .global = true, + software_mixer_init, + software_mixer_finish, + nullptr, + nullptr, + software_mixer_get_volume, + software_mixer_set_volume, + true, }; struct filter * diff --git a/src/mixer/software_mixer_plugin.h b/src/mixer/SoftwareMixerPlugin.hxx index ee2b2023c..9a625868d 100644 --- a/src/mixer/software_mixer_plugin.h +++ b/src/mixer/SoftwareMixerPlugin.hxx @@ -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 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef SOFTWARE_MIXER_PLUGIN_H -#define SOFTWARE_MIXER_PLUGIN_H +#ifndef MPD_SOFTWARE_MIXER_PLUGIN_HXX +#define MPD_SOFTWARE_MIXER_PLUGIN_HXX struct mixer; struct filter; |