aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-07 08:54:26 +0100
committerMax Kellermann <max@duempel.org>2013-01-07 09:05:06 +0100
commitc3c776bc6aa9f550a832ff3a2ace4f7980f6a791 (patch)
tree53452f78ad1ad5c384224e4279ddbab88197b664 /src/mixer
parent9f4b906e6cb61def8afddc2ed9bdf826e52e96d2 (diff)
downloadmpd-c3c776bc6aa9f550a832ff3a2ace4f7980f6a791.tar.gz
mpd-c3c776bc6aa9f550a832ff3a2ace4f7980f6a791.tar.xz
mpd-c3c776bc6aa9f550a832ff3a2ace4f7980f6a791.zip
mixer_all: convert to C++
Diffstat (limited to '')
-rw-r--r--src/MixerAll.cxx (renamed from src/mixer_all.c)11
-rw-r--r--src/MixerAll.hxx (renamed from src/mixer_all.h)8
2 files changed, 10 insertions, 9 deletions
diff --git a/src/mixer_all.c b/src/MixerAll.cxx
index 5801b7921..a214c1e24 100644
--- a/src/mixer_all.c
+++ b/src/MixerAll.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,12 +18,15 @@
*/
#include "config.h"
-#include "mixer_all.h"
+#include "MixerAll.hxx"
+#include "pcm_volume.h"
+#include "OutputAll.hxx"
+
+extern "C" {
#include "mixer_control.h"
-#include "output_all.h"
#include "output_internal.h"
-#include "pcm_volume.h"
#include "mixer_api.h"
+}
#include <glib.h>
diff --git a/src/mixer_all.h b/src/MixerAll.hxx
index fe873e713..23350a843 100644
--- a/src/mixer_all.h
+++ b/src/MixerAll.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,10 +22,8 @@
* Functions which affect the mixers of all audio outputs.
*/
-#ifndef MPD_MIXER_ALL_H
-#define MPD_MIXER_ALL_H
-
-#include <stdbool.h>
+#ifndef MPD_MIXER_ALL_HXX
+#define MPD_MIXER_ALL_HXX
/**
* Returns the average volume of all available mixers (range 0..100).