aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-02 18:16:33 +0100
committerMax Kellermann <max@duempel.org>2014-12-02 18:20:44 +0100
commit0debba0f6e35d88ad17734fda2605e4f97f19820 (patch)
tree5a3821b5f3e4ad7145ad3717dad8506ad5dd8ca4 /src
parentf2bd2c318c810645b4e3c7518d695d6d4b1c06a7 (diff)
downloadmpd-0debba0f6e35d88ad17734fda2605e4f97f19820.tar.gz
mpd-0debba0f6e35d88ad17734fda2605e4f97f19820.tar.xz
mpd-0debba0f6e35d88ad17734fda2605e4f97f19820.zip
mixer/null: new mixer plugin
Diffstat (limited to 'src')
-rw-r--r--src/mixer/MixerList.hxx1
-rw-r--r--src/mixer/MixerType.cxx2
-rw-r--r--src/mixer/MixerType.hxx3
-rw-r--r--src/mixer/plugins/NullMixerPlugin.cxx67
-rw-r--r--src/output/Init.cxx4
5 files changed, 77 insertions, 0 deletions
diff --git a/src/mixer/MixerList.hxx b/src/mixer/MixerList.hxx
index e75b2e6ff..8be74adf2 100644
--- a/src/mixer/MixerList.hxx
+++ b/src/mixer/MixerList.hxx
@@ -27,6 +27,7 @@
struct MixerPlugin;
+extern const MixerPlugin null_mixer_plugin;
extern const MixerPlugin software_mixer_plugin;
extern const MixerPlugin alsa_mixer_plugin;
extern const MixerPlugin oss_mixer_plugin;
diff --git a/src/mixer/MixerType.cxx b/src/mixer/MixerType.cxx
index 0605f0979..8972118e5 100644
--- a/src/mixer/MixerType.cxx
+++ b/src/mixer/MixerType.cxx
@@ -34,6 +34,8 @@ mixer_type_parse(const char *input)
return MixerType::HARDWARE;
else if (strcmp(input, "software") == 0)
return MixerType::SOFTWARE;
+ else if (strcmp(input, "null") == 0)
+ return MixerType::NULL_;
else
return MixerType::UNKNOWN;
}
diff --git a/src/mixer/MixerType.hxx b/src/mixer/MixerType.hxx
index 9831e3db6..40f60203d 100644
--- a/src/mixer/MixerType.hxx
+++ b/src/mixer/MixerType.hxx
@@ -27,6 +27,9 @@ enum class MixerType {
/** mixer disabled */
NONE,
+ /** "null" mixer (virtual fake) */
+ NULL_,
+
/** software mixer with pcm_volume() */
SOFTWARE,
diff --git a/src/mixer/plugins/NullMixerPlugin.cxx b/src/mixer/plugins/NullMixerPlugin.cxx
new file mode 100644
index 000000000..b8894d443
--- /dev/null
+++ b/src/mixer/plugins/NullMixerPlugin.cxx
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "mixer/MixerInternal.hxx"
+
+class NullMixer final : public Mixer {
+ /**
+ * The current volume in percent (0..100).
+ */
+ unsigned volume;
+
+public:
+ NullMixer(MixerListener &_listener)
+ :Mixer(null_mixer_plugin, _listener),
+ volume(100)
+ {
+ }
+
+ /* virtual methods from class Mixer */
+ bool Open(gcc_unused Error &error) override {
+ return true;
+ }
+
+ void Close() override {
+ }
+
+ int GetVolume(gcc_unused Error &error) override {
+ return volume;
+ }
+
+ bool SetVolume(unsigned _volume, gcc_unused Error &error) override {
+ volume = _volume;
+ return true;
+ }
+};
+
+static Mixer *
+null_mixer_init(gcc_unused EventLoop &event_loop,
+ gcc_unused AudioOutput &ao,
+ MixerListener &listener,
+ gcc_unused const config_param &param,
+ gcc_unused Error &error)
+{
+ return new NullMixer(listener);
+}
+
+const MixerPlugin null_mixer_plugin = {
+ null_mixer_init,
+ true,
+};
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index 3518c5c64..9418b6414 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -126,6 +126,10 @@ audio_output_load_mixer(EventLoop &event_loop, AudioOutput &ao,
case MixerType::UNKNOWN:
return nullptr;
+ case MixerType::NULL_:
+ return mixer_new(event_loop, null_mixer_plugin, ao, listener,
+ param, error);
+
case MixerType::HARDWARE:
if (plugin == nullptr)
return nullptr;