aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/MixerControl.cxx (renamed from src/mixer_control.c)6
-rw-r--r--src/MixerControl.hxx (renamed from src/mixer_control.h)8
-rw-r--r--src/MixerInternal.cxx (renamed from src/mixer_api.c)4
-rw-r--r--src/MixerInternal.hxx (renamed from src/mixer_api.h)18
-rw-r--r--src/MixerList.hxx (renamed from src/mixer_list.h)6
-rw-r--r--src/MixerPlugin.hxx (renamed from src/mixer_plugin.h)8
-rw-r--r--src/MixerType.cxx (renamed from src/mixer_type.c)4
-rw-r--r--src/MixerType.hxx (renamed from src/mixer_type.h)6
-rw-r--r--src/mixer/AlsaMixerPlugin.cxx2
-rw-r--r--src/mixer/OssMixerPlugin.cxx2
-rw-r--r--src/mixer/PulseMixerPlugin.cxx2
-rw-r--r--src/mixer/RoarMixerPlugin.cxx2
-rw-r--r--src/mixer/SoftwareMixerPlugin.cxx2
-rw-r--r--src/mixer/WinmmMixerPlugin.cxx2
14 files changed, 31 insertions, 41 deletions
diff --git a/src/mixer_control.c b/src/MixerControl.cxx
index 3e984dd04..4ca1c76ec 100644
--- a/src/mixer_control.c
+++ b/src/MixerControl.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,8 +18,8 @@
*/
#include "config.h"
-#include "mixer_control.h"
-#include "mixer_api.h"
+#include "MixerControl.hxx"
+#include "MixerInternal.hxx"
#include <assert.h>
#include <stddef.h>
diff --git a/src/mixer_control.h b/src/MixerControl.hxx
index 46219e5dd..ee1e959da 100644
--- a/src/mixer_control.h
+++ b/src/MixerControl.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
@@ -22,13 +22,11 @@
* Functions which manipulate a #mixer object.
*/
-#ifndef MPD_MIXER_CONTROL_H
-#define MPD_MIXER_CONTROL_H
+#ifndef MPD_MIXER_CONTROL_HXX
+#define MPD_MIXER_CONTROL_HXX
#include "gerror.h"
-#include <stdbool.h>
-
struct mixer;
struct mixer_plugin;
struct config_param;
diff --git a/src/mixer_api.c b/src/MixerInternal.cxx
index c85916c94..b8729fc7e 100644
--- a/src/mixer_api.c
+++ b/src/MixerInternal.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 "mixer_api.h"
+#include "MixerInternal.hxx"
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mixer"
diff --git a/src/mixer_api.h b/src/MixerInternal.hxx
index f0c9a0937..9c39e3e35 100644
--- a/src/mixer_api.h
+++ b/src/MixerInternal.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,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_MIXER_H
-#define MPD_MIXER_H
+#ifndef MPD_MIXER_INTERNAL_HXX
+#define MPD_MIXER_INTERNAL_HXX
-#include "mixer_plugin.h"
-#include "mixer_list.h"
+#include "MixerPlugin.hxx"
+#include "MixerList.hxx"
#include <glib.h>
@@ -46,15 +46,7 @@ struct mixer {
bool failed;
};
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void
mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin);
-#ifdef __cplusplus
-}
-#endif
-
#endif
diff --git a/src/mixer_list.h b/src/MixerList.hxx
index 078358ec3..440f442ba 100644
--- a/src/mixer_list.h
+++ b/src/MixerList.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
@@ -22,8 +22,8 @@
* This header provides "extern" declarations for all mixer plugins.
*/
-#ifndef MPD_MIXER_LIST_H
-#define MPD_MIXER_LIST_H
+#ifndef MPD_MIXER_LIST_HXX
+#define MPD_MIXER_LIST_HXX
extern const struct mixer_plugin software_mixer_plugin;
extern const struct mixer_plugin alsa_mixer_plugin;
diff --git a/src/mixer_plugin.h b/src/MixerPlugin.hxx
index 2f3beed1d..1fbdfbbc2 100644
--- a/src/mixer_plugin.h
+++ b/src/MixerPlugin.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
@@ -20,12 +20,12 @@
/** \file
*
* This header declares the mixer_plugin class. It should not be
- * included directly; use mixer_api.h instead in mixer
+ * included directly; use MixerInternal.hxx instead in mixer
* implementations.
*/
-#ifndef MPD_MIXER_PLUGIN_H
-#define MPD_MIXER_PLUGIN_H
+#ifndef MPD_MIXER_PLUGIN_HXX
+#define MPD_MIXER_PLUGIN_HXX
#include "gerror.h"
diff --git a/src/mixer_type.c b/src/MixerType.cxx
index a479caf16..435079790 100644
--- a/src/mixer_type.c
+++ b/src/MixerType.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 "mixer_type.h"
+#include "MixerType.hxx"
#include <assert.h>
#include <string.h>
diff --git a/src/mixer_type.h b/src/MixerType.hxx
index 15d136b5b..320a36c04 100644
--- a/src/mixer_type.h
+++ b/src/MixerType.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 MPD_MIXER_TYPE_H
-#define MPD_MIXER_TYPE_H
+#ifndef MPD_MIXER_TYPE_HXX
+#define MPD_MIXER_TYPE_HXX
enum mixer_type {
/** parser error */
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx
index 17f8b9a6f..d75016c00 100644
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/AlsaMixerPlugin.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "output_api.h"
#include "GlobalEvents.hxx"
#include "Main.hxx"
diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/OssMixerPlugin.cxx
index 490a65414..8d266b40a 100644
--- a/src/mixer/OssMixerPlugin.cxx
+++ b/src/mixer/OssMixerPlugin.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "output_api.h"
#include "fd_util.h"
diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx
index 65dbc01fe..d7c6c8043 100644
--- a/src/mixer/PulseMixerPlugin.cxx
+++ b/src/mixer/PulseMixerPlugin.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "PulseMixerPlugin.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "output/pulse_output_plugin.h"
#include "conf.h"
#include "GlobalEvents.hxx"
diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/RoarMixerPlugin.cxx
index 2803203b7..a027f8570 100644
--- a/src/mixer/RoarMixerPlugin.cxx
+++ b/src/mixer/RoarMixerPlugin.cxx
@@ -20,7 +20,7 @@
#include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "output_api.h"
#include "output/RoarOutputPlugin.hxx"
diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx
index 16463938f..6c287ea07 100644
--- a/src/mixer/SoftwareMixerPlugin.cxx
+++ b/src/mixer/SoftwareMixerPlugin.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "SoftwareMixerPlugin.hxx"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "FilterPlugin.hxx"
#include "FilterRegistry.hxx"
#include "filter/VolumeFilterPlugin.hxx"
diff --git a/src/mixer/WinmmMixerPlugin.cxx b/src/mixer/WinmmMixerPlugin.cxx
index e3b7948e3..bf3155864 100644
--- a/src/mixer/WinmmMixerPlugin.cxx
+++ b/src/mixer/WinmmMixerPlugin.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
#include "output_api.h"
#include "output/WinmmOutputPlugin.hxx"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 12:19:40 +0000