aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-31 21:00:43 +0100
committerMax Kellermann <max@duempel.org>2013-01-31 21:11:06 +0100
commit776413621165605b943248499e2a5a6662fb1a3b (patch)
tree68ec7eb1de864f74eda4526391effde1b7e1a75f /src
parent0307801d5164b3119a0da6eec83e9616665e6511 (diff)
downloadmpd-776413621165605b943248499e2a5a6662fb1a3b.tar.gz
mpd-776413621165605b943248499e2a5a6662fb1a3b.tar.xz
mpd-776413621165605b943248499e2a5a6662fb1a3b.zip
mixer/software, filter/volume: convert to C++
Diffstat (limited to 'src')
-rw-r--r--src/OutputInit.cxx2
-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
-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
5 files changed, 27 insertions, 24 deletions
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx
index 037f9ea44..6cd1e08ba 100644
--- a/src/OutputInit.cxx
+++ b/src/OutputInit.cxx
@@ -30,12 +30,12 @@ extern "C" {
#include "mixer_control.h"
#include "mixer_type.h"
#include "mixer_list.h"
-#include "mixer/software_mixer_plugin.h"
#include "filter_plugin.h"
#include "filter_registry.h"
#include "filter/chain_filter_plugin.h"
}
+#include "mixer/SoftwareMixerPlugin.hxx"
#include "filter/AutoConvertFilterPlugin.hxx"
#include "filter/ReplayGainFilterPlugin.hxx"
diff --git a/src/filter/volume_filter_plugin.c b/src/filter/VolumeFilterPlugin.cxx
index 3260e8989..764d2453f 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 5b16f7e57..e3d29b87d 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;
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;