From 097e200a97dfda0844c93f53f1c0a1e6f5d07201 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 20 Oct 2009 21:23:05 +0200
Subject: mixer/{oss,alsa}: renamed the mixer source files

---
 src/mixer/alsa_mixer.c        | 222 ------------------------------------------
 src/mixer/alsa_mixer_plugin.c | 222 ++++++++++++++++++++++++++++++++++++++++++
 src/mixer/oss_mixer.c         | 195 -------------------------------------
 src/mixer/oss_mixer_plugin.c  | 195 +++++++++++++++++++++++++++++++++++++
 src/mixer_list.h              |   4 +-
 src/output/alsa_plugin.c      |   3 +-
 src/output/oss_plugin.c       |   3 +-
 7 files changed, 423 insertions(+), 421 deletions(-)
 delete mode 100644 src/mixer/alsa_mixer.c
 create mode 100644 src/mixer/alsa_mixer_plugin.c
 delete mode 100644 src/mixer/oss_mixer.c
 create mode 100644 src/mixer/oss_mixer_plugin.c

(limited to 'src')

diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c
deleted file mode 100644
index 52e553cc5..000000000
--- a/src/mixer/alsa_mixer.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2003-2009 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 "../output_api.h"
-#include "../mixer_api.h"
-
-#include <glib.h>
-#include <alsa/asoundlib.h>
-
-#define VOLUME_MIXER_ALSA_DEFAULT		"default"
-#define VOLUME_MIXER_ALSA_CONTROL_DEFAULT	"PCM"
-#define VOLUME_MIXER_ALSA_INDEX_DEFAULT		0
-
-struct alsa_mixer {
-	/** the base mixer class */
-	struct mixer base;
-
-	const char *device;
-	const char *control;
-	unsigned int index;
-
-	snd_mixer_t *handle;
-	snd_mixer_elem_t *elem;
-	long volume_min;
-	long volume_max;
-	int volume_set;
-};
-
-static struct mixer *
-alsa_mixer_init(const struct config_param *param)
-{
-	struct alsa_mixer *am = g_new(struct alsa_mixer, 1);
-
-	mixer_init(&am->base, &alsa_mixer);
-
-	am->device = config_get_block_string(param, "mixer_device",
-					     VOLUME_MIXER_ALSA_DEFAULT);
-	am->control = config_get_block_string(param, "mixer_control",
-					      VOLUME_MIXER_ALSA_CONTROL_DEFAULT);
-	am->index = config_get_block_unsigned(param, "mixer_index",
-					      VOLUME_MIXER_ALSA_INDEX_DEFAULT);
-
-	return &am->base;
-}
-
-static void
-alsa_mixer_finish(struct mixer *data)
-{
-	struct alsa_mixer *am = (struct alsa_mixer *)data;
-
-	g_free(am);
-
-	/* free libasound's config cache */
-	snd_config_update_free_global();
-}
-
-static void
-alsa_mixer_close(struct mixer *data)
-{
-	struct alsa_mixer *am = (struct alsa_mixer *)data;
-
-	assert(am->handle != NULL);
-
-	snd_mixer_close(am->handle);
-}
-
-static bool
-alsa_mixer_open(struct mixer *data)
-{
-	struct alsa_mixer *am = (struct alsa_mixer *)data;
-	int err;
-	snd_mixer_elem_t *elem;
-
-	am->volume_set = -1;
-
-	err = snd_mixer_open(&am->handle, 0);
-	if (err < 0) {
-		g_warning("problems opening alsa mixer: %s\n", snd_strerror(err));
-		return false;
-	}
-
-	if ((err = snd_mixer_attach(am->handle, am->device)) < 0) {
-		g_warning("problems attaching alsa mixer: %s\n",
-			snd_strerror(err));
-		alsa_mixer_close(data);
-		return false;
-	}
-
-	if ((err = snd_mixer_selem_register(am->handle, NULL,
-		    NULL)) < 0) {
-		g_warning("problems snd_mixer_selem_register'ing: %s\n",
-			snd_strerror(err));
-		alsa_mixer_close(data);
-		return false;
-	}
-
-	if ((err = snd_mixer_load(am->handle)) < 0) {
-		g_warning("problems snd_mixer_selem_register'ing: %s\n",
-			snd_strerror(err));
-		alsa_mixer_close(data);
-		return false;
-	}
-
-	elem = snd_mixer_first_elem(am->handle);
-
-	while (elem) {
-		if (snd_mixer_elem_get_type(elem) == SND_MIXER_ELEM_SIMPLE) {
-			if ((g_ascii_strcasecmp(am->control,
-						snd_mixer_selem_get_name(elem)) == 0) &&
-			    (am->index == snd_mixer_selem_get_index(elem))) {
-				break;
-			}
-		}
-		elem = snd_mixer_elem_next(elem);
-	}
-
-	if (elem) {
-		am->elem = elem;
-		snd_mixer_selem_get_playback_volume_range(am->elem,
-							  &am->volume_min,
-							  &am->volume_max);
-		return true;
-	}
-
-	g_warning("can't find alsa mixer control \"%s\"\n", am->control);
-
-	alsa_mixer_close(data);
-	return false;
-}
-
-static int
-alsa_mixer_get_volume(struct mixer *mixer)
-{
-	struct alsa_mixer *am = (struct alsa_mixer *)mixer;
-	int err;
-	int ret;
-	long level;
-
-	assert(am->handle != NULL);
-
-	err = snd_mixer_handle_events(am->handle);
-	if (err < 0) {
-		g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n",
-			  snd_strerror(err), "handle_events");
-		return false;
-	}
-
-	err = snd_mixer_selem_get_playback_volume(am->elem,
-						  SND_MIXER_SCHN_FRONT_LEFT,
-						  &level);
-	if (err < 0) {
-		g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n",
-			  snd_strerror(err), "selem_get_playback_volume");
-		return false;
-	}
-
-	ret = ((am->volume_set / 100.0) * (am->volume_max - am->volume_min)
-	       + am->volume_min) + 0.5;
-	if (am->volume_set > 0 && ret == level) {
-		ret = am->volume_set;
-	} else {
-		ret = (int)(100 * (((float)(level - am->volume_min)) /
-				   (am->volume_max - am->volume_min)) + 0.5);
-	}
-
-	return ret;
-}
-
-static bool
-alsa_mixer_set_volume(struct mixer *mixer, unsigned volume)
-{
-	struct alsa_mixer *am = (struct alsa_mixer *)mixer;
-	float vol;
-	long level;
-	int err;
-
-	assert(am->handle != NULL);
-
-	vol = volume;
-
-	am->volume_set = vol + 0.5;
-
-	level = (long)(((vol / 100.0) * (am->volume_max - am->volume_min) +
-			am->volume_min) + 0.5);
-	level = level > am->volume_max ? am->volume_max : level;
-	level = level < am->volume_min ? am->volume_min : level;
-
-	err = snd_mixer_selem_set_playback_volume_all(am->elem, level);
-	if (err < 0) {
-		g_warning("problems setting alsa volume: %s\n",
-			  snd_strerror(err));
-		return false;
-	}
-
-	return true;
-}
-
-const struct mixer_plugin alsa_mixer = {
-	.init = alsa_mixer_init,
-	.finish = alsa_mixer_finish,
-	.open = alsa_mixer_open,
-	.close = alsa_mixer_close,
-	.get_volume = alsa_mixer_get_volume,
-	.set_volume = alsa_mixer_set_volume,
-	.global = true,
-};
diff --git a/src/mixer/alsa_mixer_plugin.c b/src/mixer/alsa_mixer_plugin.c
new file mode 100644
index 000000000..1a32ea9e1
--- /dev/null
+++ b/src/mixer/alsa_mixer_plugin.c
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2003-2009 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 "mixer_api.h"
+#include "output_api.h"
+
+#include <glib.h>
+#include <alsa/asoundlib.h>
+
+#define VOLUME_MIXER_ALSA_DEFAULT		"default"
+#define VOLUME_MIXER_ALSA_CONTROL_DEFAULT	"PCM"
+#define VOLUME_MIXER_ALSA_INDEX_DEFAULT		0
+
+struct alsa_mixer {
+	/** the base mixer class */
+	struct mixer base;
+
+	const char *device;
+	const char *control;
+	unsigned int index;
+
+	snd_mixer_t *handle;
+	snd_mixer_elem_t *elem;
+	long volume_min;
+	long volume_max;
+	int volume_set;
+};
+
+static struct mixer *
+alsa_mixer_init(const struct config_param *param)
+{
+	struct alsa_mixer *am = g_new(struct alsa_mixer, 1);
+
+	mixer_init(&am->base, &alsa_mixer_plugin);
+
+	am->device = config_get_block_string(param, "mixer_device",
+					     VOLUME_MIXER_ALSA_DEFAULT);
+	am->control = config_get_block_string(param, "mixer_control",
+					      VOLUME_MIXER_ALSA_CONTROL_DEFAULT);
+	am->index = config_get_block_unsigned(param, "mixer_index",
+					      VOLUME_MIXER_ALSA_INDEX_DEFAULT);
+
+	return &am->base;
+}
+
+static void
+alsa_mixer_finish(struct mixer *data)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)data;
+
+	g_free(am);
+
+	/* free libasound's config cache */
+	snd_config_update_free_global();
+}
+
+static void
+alsa_mixer_close(struct mixer *data)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)data;
+
+	assert(am->handle != NULL);
+
+	snd_mixer_close(am->handle);
+}
+
+static bool
+alsa_mixer_open(struct mixer *data)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)data;
+	int err;
+	snd_mixer_elem_t *elem;
+
+	am->volume_set = -1;
+
+	err = snd_mixer_open(&am->handle, 0);
+	if (err < 0) {
+		g_warning("problems opening alsa mixer: %s\n", snd_strerror(err));
+		return false;
+	}
+
+	if ((err = snd_mixer_attach(am->handle, am->device)) < 0) {
+		g_warning("problems attaching alsa mixer: %s\n",
+			snd_strerror(err));
+		alsa_mixer_close(data);
+		return false;
+	}
+
+	if ((err = snd_mixer_selem_register(am->handle, NULL,
+		    NULL)) < 0) {
+		g_warning("problems snd_mixer_selem_register'ing: %s\n",
+			snd_strerror(err));
+		alsa_mixer_close(data);
+		return false;
+	}
+
+	if ((err = snd_mixer_load(am->handle)) < 0) {
+		g_warning("problems snd_mixer_selem_register'ing: %s\n",
+			snd_strerror(err));
+		alsa_mixer_close(data);
+		return false;
+	}
+
+	elem = snd_mixer_first_elem(am->handle);
+
+	while (elem) {
+		if (snd_mixer_elem_get_type(elem) == SND_MIXER_ELEM_SIMPLE) {
+			if ((g_ascii_strcasecmp(am->control,
+						snd_mixer_selem_get_name(elem)) == 0) &&
+			    (am->index == snd_mixer_selem_get_index(elem))) {
+				break;
+			}
+		}
+		elem = snd_mixer_elem_next(elem);
+	}
+
+	if (elem) {
+		am->elem = elem;
+		snd_mixer_selem_get_playback_volume_range(am->elem,
+							  &am->volume_min,
+							  &am->volume_max);
+		return true;
+	}
+
+	g_warning("can't find alsa mixer control \"%s\"\n", am->control);
+
+	alsa_mixer_close(data);
+	return false;
+}
+
+static int
+alsa_mixer_get_volume(struct mixer *mixer)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)mixer;
+	int err;
+	int ret;
+	long level;
+
+	assert(am->handle != NULL);
+
+	err = snd_mixer_handle_events(am->handle);
+	if (err < 0) {
+		g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n",
+			  snd_strerror(err), "handle_events");
+		return false;
+	}
+
+	err = snd_mixer_selem_get_playback_volume(am->elem,
+						  SND_MIXER_SCHN_FRONT_LEFT,
+						  &level);
+	if (err < 0) {
+		g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n",
+			  snd_strerror(err), "selem_get_playback_volume");
+		return false;
+	}
+
+	ret = ((am->volume_set / 100.0) * (am->volume_max - am->volume_min)
+	       + am->volume_min) + 0.5;
+	if (am->volume_set > 0 && ret == level) {
+		ret = am->volume_set;
+	} else {
+		ret = (int)(100 * (((float)(level - am->volume_min)) /
+				   (am->volume_max - am->volume_min)) + 0.5);
+	}
+
+	return ret;
+}
+
+static bool
+alsa_mixer_set_volume(struct mixer *mixer, unsigned volume)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)mixer;
+	float vol;
+	long level;
+	int err;
+
+	assert(am->handle != NULL);
+
+	vol = volume;
+
+	am->volume_set = vol + 0.5;
+
+	level = (long)(((vol / 100.0) * (am->volume_max - am->volume_min) +
+			am->volume_min) + 0.5);
+	level = level > am->volume_max ? am->volume_max : level;
+	level = level < am->volume_min ? am->volume_min : level;
+
+	err = snd_mixer_selem_set_playback_volume_all(am->elem, level);
+	if (err < 0) {
+		g_warning("problems setting alsa volume: %s\n",
+			  snd_strerror(err));
+		return false;
+	}
+
+	return true;
+}
+
+const struct mixer_plugin alsa_mixer_plugin = {
+	.init = alsa_mixer_init,
+	.finish = alsa_mixer_finish,
+	.open = alsa_mixer_open,
+	.close = alsa_mixer_close,
+	.get_volume = alsa_mixer_get_volume,
+	.set_volume = alsa_mixer_set_volume,
+	.global = true,
+};
diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c
deleted file mode 100644
index f2db01ff4..000000000
--- a/src/mixer/oss_mixer.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2003-2009 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 "../output_api.h"
-#include "../mixer_api.h"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-# include <soundcard.h>
-#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
-# include <sys/soundcard.h>
-#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
-
-#define VOLUME_MIXER_OSS_DEFAULT		"/dev/mixer"
-
-struct oss_mixer {
-	/** the base mixer class */
-	struct mixer base;
-
-	const char *device;
-	const char *control;
-
-	int device_fd;
-	int volume_control;
-};
-
-static int
-oss_find_mixer(const char *name)
-{
-	const char *labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
-	size_t name_length = strlen(name);
-
-	for (unsigned i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
-		if (g_ascii_strncasecmp(name, labels[i], name_length) == 0 &&
-		    (labels[i][name_length] == 0 ||
-		     labels[i][name_length] == ' '))
-			return i;
-	}
-	return -1;
-}
-
-static struct mixer *
-oss_mixer_init(const struct config_param *param)
-{
-	struct oss_mixer *om = g_new(struct oss_mixer, 1);
-
-	mixer_init(&om->base, &oss_mixer);
-
-	om->device = config_get_block_string(param, "mixer_device",
-					     VOLUME_MIXER_OSS_DEFAULT);
-	om->control = config_get_block_string(param, "mixer_control", NULL);
-
-	if (om->control != NULL) {
-		om->volume_control = oss_find_mixer(om->control);
-		if (om->volume_control < 0) {
-			g_warning("mixer control \"%s\" not found",
-				  om->control);
-			g_free(om);
-			return NULL;
-		}
-	} else
-		om->volume_control = SOUND_MIXER_PCM;
-
-	return &om->base;
-}
-
-static void
-oss_mixer_finish(struct mixer *data)
-{
-	struct oss_mixer *om = (struct oss_mixer *) data;
-
-	g_free(om);
-}
-
-static void
-oss_mixer_close(struct mixer *data)
-{
-	struct oss_mixer *om = (struct oss_mixer *) data;
-
-	assert(om->device_fd >= 0);
-
-	close(om->device_fd);
-}
-
-static bool
-oss_mixer_open(struct mixer *data)
-{
-	struct oss_mixer *om = (struct oss_mixer *) data;
-
-	om->device_fd = open(om->device, O_RDONLY);
-	if (om->device_fd < 0) {
-		g_warning("Unable to open oss mixer \"%s\"\n", om->device);
-		return false;
-	}
-
-	if (om->control) {
-		int devmask = 0;
-
-		if (ioctl(om->device_fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
-			g_warning("errors getting read_devmask for oss mixer\n");
-			oss_mixer_close(data);
-			return false;
-		}
-
-		if (((1 << om->volume_control) & devmask) == 0) {
-			g_warning("mixer control \"%s\" not usable\n",
-				om->control);
-			oss_mixer_close(data);
-			return false;
-		}
-	}
-	return true;
-}
-
-static int
-oss_mixer_get_volume(struct mixer *mixer)
-{
-	struct oss_mixer *om = (struct oss_mixer *)mixer;
-	int left, right, level;
-	int ret;
-
-	assert(om->device_fd >= 0);
-
-	ret = ioctl(om->device_fd, MIXER_READ(om->volume_control), &level);
-	if (ret < 0) {
-		g_warning("unable to read oss volume\n");
-		return false;
-	}
-
-	left = level & 0xff;
-	right = (level & 0xff00) >> 8;
-
-	if (left != right) {
-		g_warning("volume for left and right is not the same, \"%i\" and "
-			  "\"%i\"\n", left, right);
-	}
-
-	return left;
-}
-
-static bool
-oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
-{
-	struct oss_mixer *om = (struct oss_mixer *)mixer;
-	int level;
-	int ret;
-
-	assert(om->device_fd >= 0);
-	assert(volume <= 100);
-
-	level = (volume << 8) + volume;
-
-	ret = ioctl(om->device_fd, MIXER_WRITE(om->volume_control), &level);
-	if (ret < 0) {
-		g_warning("unable to set oss volume\n");
-		return false;
-	}
-
-	return true;
-}
-
-const struct mixer_plugin oss_mixer = {
-	.init = oss_mixer_init,
-	.finish = oss_mixer_finish,
-	.open = oss_mixer_open,
-	.close = oss_mixer_close,
-	.get_volume = oss_mixer_get_volume,
-	.set_volume = oss_mixer_set_volume,
-	.global = true,
-};
diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c
new file mode 100644
index 000000000..fb0fd787e
--- /dev/null
+++ b/src/mixer/oss_mixer_plugin.c
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2003-2009 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 "mixer_api.h"
+#include "output_api.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+# include <soundcard.h>
+#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
+# include <sys/soundcard.h>
+#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
+
+#define VOLUME_MIXER_OSS_DEFAULT		"/dev/mixer"
+
+struct oss_mixer {
+	/** the base mixer class */
+	struct mixer base;
+
+	const char *device;
+	const char *control;
+
+	int device_fd;
+	int volume_control;
+};
+
+static int
+oss_find_mixer(const char *name)
+{
+	const char *labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
+	size_t name_length = strlen(name);
+
+	for (unsigned i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
+		if (g_ascii_strncasecmp(name, labels[i], name_length) == 0 &&
+		    (labels[i][name_length] == 0 ||
+		     labels[i][name_length] == ' '))
+			return i;
+	}
+	return -1;
+}
+
+static struct mixer *
+oss_mixer_init(const struct config_param *param)
+{
+	struct oss_mixer *om = g_new(struct oss_mixer, 1);
+
+	mixer_init(&om->base, &oss_mixer_plugin);
+
+	om->device = config_get_block_string(param, "mixer_device",
+					     VOLUME_MIXER_OSS_DEFAULT);
+	om->control = config_get_block_string(param, "mixer_control", NULL);
+
+	if (om->control != NULL) {
+		om->volume_control = oss_find_mixer(om->control);
+		if (om->volume_control < 0) {
+			g_warning("mixer control \"%s\" not found",
+				  om->control);
+			g_free(om);
+			return NULL;
+		}
+	} else
+		om->volume_control = SOUND_MIXER_PCM;
+
+	return &om->base;
+}
+
+static void
+oss_mixer_finish(struct mixer *data)
+{
+	struct oss_mixer *om = (struct oss_mixer *) data;
+
+	g_free(om);
+}
+
+static void
+oss_mixer_close(struct mixer *data)
+{
+	struct oss_mixer *om = (struct oss_mixer *) data;
+
+	assert(om->device_fd >= 0);
+
+	close(om->device_fd);
+}
+
+static bool
+oss_mixer_open(struct mixer *data)
+{
+	struct oss_mixer *om = (struct oss_mixer *) data;
+
+	om->device_fd = open(om->device, O_RDONLY);
+	if (om->device_fd < 0) {
+		g_warning("Unable to open oss mixer \"%s\"\n", om->device);
+		return false;
+	}
+
+	if (om->control) {
+		int devmask = 0;
+
+		if (ioctl(om->device_fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
+			g_warning("errors getting read_devmask for oss mixer\n");
+			oss_mixer_close(data);
+			return false;
+		}
+
+		if (((1 << om->volume_control) & devmask) == 0) {
+			g_warning("mixer control \"%s\" not usable\n",
+				om->control);
+			oss_mixer_close(data);
+			return false;
+		}
+	}
+	return true;
+}
+
+static int
+oss_mixer_get_volume(struct mixer *mixer)
+{
+	struct oss_mixer *om = (struct oss_mixer *)mixer;
+	int left, right, level;
+	int ret;
+
+	assert(om->device_fd >= 0);
+
+	ret = ioctl(om->device_fd, MIXER_READ(om->volume_control), &level);
+	if (ret < 0) {
+		g_warning("unable to read oss volume\n");
+		return false;
+	}
+
+	left = level & 0xff;
+	right = (level & 0xff00) >> 8;
+
+	if (left != right) {
+		g_warning("volume for left and right is not the same, \"%i\" and "
+			  "\"%i\"\n", left, right);
+	}
+
+	return left;
+}
+
+static bool
+oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
+{
+	struct oss_mixer *om = (struct oss_mixer *)mixer;
+	int level;
+	int ret;
+
+	assert(om->device_fd >= 0);
+	assert(volume <= 100);
+
+	level = (volume << 8) + volume;
+
+	ret = ioctl(om->device_fd, MIXER_WRITE(om->volume_control), &level);
+	if (ret < 0) {
+		g_warning("unable to set oss volume\n");
+		return false;
+	}
+
+	return true;
+}
+
+const struct mixer_plugin oss_mixer_plugin = {
+	.init = oss_mixer_init,
+	.finish = oss_mixer_finish,
+	.open = oss_mixer_open,
+	.close = oss_mixer_close,
+	.get_volume = oss_mixer_get_volume,
+	.set_volume = oss_mixer_set_volume,
+	.global = true,
+};
diff --git a/src/mixer_list.h b/src/mixer_list.h
index 916e3738c..2d9c773f6 100644
--- a/src/mixer_list.h
+++ b/src/mixer_list.h
@@ -26,8 +26,8 @@
 #define MPD_MIXER_LIST_H
 
 extern const struct mixer_plugin software_mixer_plugin;
-extern const struct mixer_plugin alsa_mixer;
-extern const struct mixer_plugin oss_mixer;
+extern const struct mixer_plugin alsa_mixer_plugin;
+extern const struct mixer_plugin oss_mixer_plugin;
 extern const struct mixer_plugin pulse_mixer_plugin;
 
 #endif
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index f271668b1..6ec1f77f2 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -544,5 +544,6 @@ const struct audio_output_plugin alsaPlugin = {
 	.play = alsa_play,
 	.cancel = alsa_cancel,
 	.close = alsa_close,
-	.mixer_plugin = &alsa_mixer,
+
+	.mixer_plugin = &alsa_mixer_plugin,
 };
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index a66bc0598..258fbfa9d 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -601,5 +601,6 @@ const struct audio_output_plugin oss_output_plugin = {
 	.close = oss_output_close,
 	.play = oss_output_play,
 	.cancel = oss_output_cancel,
-	.mixer_plugin = &oss_mixer,
+
+	.mixer_plugin = &oss_mixer_plugin,
 };
-- 
cgit v1.2.3