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/filter | |
| parent | 0307801d5164b3119a0da6eec83e9616665e6511 (diff) | |
mixer/software, filter/volume: convert to C++
Diffstat (limited to 'src/filter')
| -rw-r--r-- | src/filter/VolumeFilterPlugin.cxx (renamed from src/filter/volume_filter_plugin.c) | 19 | ||||
| -rw-r--r-- | src/filter/VolumeFilterPlugin.hxx (renamed from src/filter/volume_filter_plugin.h) | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/filter/volume_filter_plugin.c b/src/filter/VolumeFilterPlugin.cxx index 3260e898..764d2453 100644 --- a/src/filter/volume_filter_plugin.c +++ b/src/filter/VolumeFilterPlugin.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,7 +18,7 @@ */ #include "config.h" -#include "filter/volume_filter_plugin.h" +#include "VolumeFilterPlugin.hxx" #include "filter_plugin.h" #include "filter_internal.h" #include "filter_registry.h" @@ -113,7 +113,8 @@ volume_filter_filter(struct filter *_filter, const void *src, size_t src_size, memcpy(dest, src, src_size); - success = pcm_volume(dest, src_size, filter->audio_format.format, + success = pcm_volume(dest, src_size, + sample_format(filter->audio_format.format), filter->volume); if (!success) { g_set_error(error_r, volume_quark(), 0, @@ -125,12 +126,12 @@ volume_filter_filter(struct filter *_filter, const void *src, size_t src_size, } const struct filter_plugin volume_filter_plugin = { - .name = "volume", - .init = volume_filter_init, - .finish = volume_filter_finish, - .open = volume_filter_open, - .close = volume_filter_close, - .filter = volume_filter_filter, + "volume", + volume_filter_init, + volume_filter_finish, + volume_filter_open, + volume_filter_close, + volume_filter_filter, }; unsigned diff --git a/src/filter/volume_filter_plugin.h b/src/filter/VolumeFilterPlugin.hxx index 5b16f7e5..e3d29b87 100644 --- a/src/filter/volume_filter_plugin.h +++ b/src/filter/VolumeFilterPlugin.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 VOLUME_FILTER_PLUGIN_H -#define VOLUME_FILTER_PLUGIN_H +#ifndef MPD_VOLUME_FILTER_PLUGIN_HXX +#define MPD_VOLUME_FILTER_PLUGIN_HXX struct filter; |