18 files changed, 365 insertions, 67 deletions

diff --git a/src/mixer/alsa_mixer_plugin.c b/src/mixer/alsa_mixer_plugin.c
index 38f36cb8f..22e4e22bd 100644
--- a/src/mixer/alsa_mixer_plugin.c
+++ b/src/mixer/alsa_mixer_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "mixer_api.h"
 #include "output_api.h"
+#include "event_pipe.h"
 
 #include <glib.h>
 #include <alsa/asoundlib.h>
@@ -28,6 +29,15 @@
 #define VOLUME_MIXER_ALSA_CONTROL_DEFAULT	"PCM"
 #define VOLUME_MIXER_ALSA_INDEX_DEFAULT		0
 
+struct alsa_mixer_source {
+	GSource source;
+
+	snd_mixer_t *mixer;
+
+	/** a linked list of all registered GPollFD objects */
+	GSList *fds;
+};
+
 struct alsa_mixer {
 	/** the base mixer class */
 	struct mixer base;
@@ -41,6 +51,8 @@ struct alsa_mixer {
 	long volume_min;
 	long volume_max;
 	int volume_set;
+
+	struct alsa_mixer_source *source;
 };
 
 /**
@@ -52,6 +64,161 @@ alsa_mixer_quark(void)
 	return g_quark_from_static_string("alsa_mixer");
 }
 
+/*
+ * GSource helper functions
+ *
+ */
+
+static GSList **
+find_fd(GSList **list_r, int fd)
+{
+	while (true) {
+		GSList *list = *list_r;
+		if (list == NULL)
+			return NULL;
+
+		GPollFD *p = list->data;
+		if (p->fd == fd)
+			return list_r;
+
+		list_r = &list->next;
+	}
+}
+
+static void
+alsa_mixer_update_fd(struct alsa_mixer_source *source, const struct pollfd *p,
+		     GSList **old_r)
+{
+	GSList **found_r = find_fd(old_r, p->fd);
+	if (found_r == NULL) {
+		/* new fd */
+		GPollFD *q = g_new(GPollFD, 1);
+		q->fd = p->fd;
+		q->events = p->events;
+		g_source_add_poll(&source->source, q);
+		source->fds = g_slist_prepend(source->fds, q);
+		return;
+	}
+
+	GSList *found = *found_r;
+	*found_r = found->next;
+
+	GPollFD *q = found->data;
+	if (q->events != p->events) {
+		/* refresh events */
+		g_source_remove_poll(&source->source, q);
+		q->events = p->events;
+		g_source_add_poll(&source->source, q);
+	}
+
+	found->next = source->fds;
+	source->fds = found;
+}
+
+static void
+alsa_mixer_update_fds(struct alsa_mixer_source *source)
+{
+	int count = snd_mixer_poll_descriptors_count(source->mixer);
+	if (count < 0)
+		count = 0;
+
+	struct pollfd *pfds = g_new(struct pollfd, count);
+	count = snd_mixer_poll_descriptors(source->mixer, pfds, count);
+	if (count < 0)
+		count = 0;
+
+	GSList *old = source->fds;
+	source->fds = NULL;
+
+	for (int i = 0; i < count; ++i)
+		alsa_mixer_update_fd(source, &pfds[i], &old);
+	g_free(pfds);
+
+	for (; old != NULL; old = old->next) {
+		GPollFD *q = old->data;
+		g_source_remove_poll(&source->source, q);
+		g_free(q);
+	}
+
+	g_slist_free(old);
+}
+
+/*
+ * GSource methods
+ *
+ */
+
+static gboolean
+alsa_mixer_source_prepare(GSource *_source, G_GNUC_UNUSED gint *timeout_r)
+{
+	struct alsa_mixer_source *source = (struct alsa_mixer_source *)_source;
+	alsa_mixer_update_fds(source);
+
+	return false;
+}
+
+static gboolean
+alsa_mixer_source_check(GSource *_source)
+{
+	struct alsa_mixer_source *source = (struct alsa_mixer_source *)_source;
+
+	for (const GSList *i = source->fds; i != NULL; i = i->next) {
+		const GPollFD *poll_fd = i->data;
+		if (poll_fd->revents != 0)
+			return true;
+	}
+
+	return false;
+}
+
+static gboolean
+alsa_mixer_source_dispatch(GSource *_source,
+			   G_GNUC_UNUSED GSourceFunc callback,
+			   G_GNUC_UNUSED gpointer user_data)
+{
+	struct alsa_mixer_source *source = (struct alsa_mixer_source *)_source;
+
+	snd_mixer_handle_events(source->mixer);
+	return true;
+}
+
+static void
+alsa_mixer_source_finalize(GSource *_source)
+{
+	struct alsa_mixer_source *source = (struct alsa_mixer_source *)_source;
+
+	for (GSList *i = source->fds; i != NULL; i = i->next)
+		g_free(i->data);
+
+	g_slist_free(source->fds);
+}
+
+static GSourceFuncs alsa_mixer_source_funcs = {
+	.prepare = alsa_mixer_source_prepare,
+	.check = alsa_mixer_source_check,
+	.dispatch = alsa_mixer_source_dispatch,
+	.finalize = alsa_mixer_source_finalize,
+};
+
+/*
+ * libasound callbacks
+ *
+ */
+
+static int
+alsa_mixer_elem_callback(G_GNUC_UNUSED snd_mixer_elem_t *elem, unsigned mask)
+{
+	if (mask & SND_CTL_EVENT_MASK_VALUE)
+		event_pipe_emit(PIPE_EVENT_MIXER);
+
+	return 0;
+}
+
+/*
+ * mixer_plugin methods
+ *
+ */
+
 static struct mixer *
 alsa_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param,
 		G_GNUC_UNUSED GError **error_r)
@@ -81,34 +248,28 @@ alsa_mixer_finish(struct mixer *data)
 	snd_config_update_free_global();
 }
 
-static void
-alsa_mixer_close(struct mixer *data)
+G_GNUC_PURE
+static snd_mixer_elem_t *
+alsa_mixer_lookup_elem(snd_mixer_t *handle, const char *name, unsigned idx)
 {
-	struct alsa_mixer *am = (struct alsa_mixer *)data;
-
-	assert(am->handle != NULL);
+	for (snd_mixer_elem_t *elem = snd_mixer_first_elem(handle);
+	     elem != NULL; elem = snd_mixer_elem_next(elem)) {
+		if (snd_mixer_elem_get_type(elem) == SND_MIXER_ELEM_SIMPLE &&
+		    g_ascii_strcasecmp(snd_mixer_selem_get_name(elem),
+				       name) == 0 &&
+		    snd_mixer_selem_get_index(elem) == idx)
+			return elem;
+	}
 
-	snd_mixer_close(am->handle);
+	return NULL;
 }
 
 static bool
-alsa_mixer_open(struct mixer *data, GError **error_r)
+alsa_mixer_setup(struct alsa_mixer *am, GError **error_r)
 {
-	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_set_error(error_r, alsa_mixer_quark(), err,
-			    "snd_mixer_open() failed: %s", snd_strerror(err));
-		return false;
-	}
 
 	if ((err = snd_mixer_attach(am->handle, am->device)) < 0) {
-		alsa_mixer_close(data);
 		g_set_error(error_r, alsa_mixer_quark(), err,
 			    "failed to attach to %s: %s",
 			    am->device, snd_strerror(err));
@@ -117,7 +278,6 @@ alsa_mixer_open(struct mixer *data, GError **error_r)
 
 	if ((err = snd_mixer_selem_register(am->handle, NULL,
 		    NULL)) < 0) {
-		alsa_mixer_close(data);
 		g_set_error(error_r, alsa_mixer_quark(), err,
 			    "snd_mixer_selem_register() failed: %s",
 			    snd_strerror(err));
@@ -125,38 +285,69 @@ alsa_mixer_open(struct mixer *data, GError **error_r)
 	}
 
 	if ((err = snd_mixer_load(am->handle)) < 0) {
-		alsa_mixer_close(data);
 		g_set_error(error_r, alsa_mixer_quark(), err,
 			    "snd_mixer_load() failed: %s\n",
 			    snd_strerror(err));
 		return false;
 	}
 
-	elem = snd_mixer_first_elem(am->handle);
+	am->elem = alsa_mixer_lookup_elem(am->handle, am->control, am->index);
+	if (am->elem == NULL) {
+		g_set_error(error_r, alsa_mixer_quark(), 0,
+			    "no such mixer control: %s", am->control);
+		return false;
+	}
+
+	snd_mixer_selem_get_playback_volume_range(am->elem,
+						  &am->volume_min,
+						  &am->volume_max);
+
+	snd_mixer_elem_set_callback(am->elem, alsa_mixer_elem_callback);
 
-	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);
+	am->source = (struct alsa_mixer_source *)
+		g_source_new(&alsa_mixer_source_funcs, sizeof(*am->source));
+	am->source->mixer = am->handle;
+	am->source->fds = NULL;
+	g_source_attach(&am->source->source, g_main_context_default());
+
+	return true;
+}
+
+static bool
+alsa_mixer_open(struct mixer *data, GError **error_r)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)data;
+	int err;
+
+	am->volume_set = -1;
+
+	err = snd_mixer_open(&am->handle, 0);
+	if (err < 0) {
+		g_set_error(error_r, alsa_mixer_quark(), err,
+			    "snd_mixer_open() failed: %s", snd_strerror(err));
+		return false;
 	}
 
-	if (elem) {
-		am->elem = elem;
-		snd_mixer_selem_get_playback_volume_range(am->elem,
-							  &am->volume_min,
-							  &am->volume_max);
-		return true;
+	if (!alsa_mixer_setup(am, error_r)) {
+		snd_mixer_close(am->handle);
+		return false;
 	}
 
-	alsa_mixer_close(data);
-	g_set_error(error_r, alsa_mixer_quark(), 0,
-		    "no such mixer control: %s", am->control);
-	return false;
+	return true;
+}
+
+static void
+alsa_mixer_close(struct mixer *data)
+{
+	struct alsa_mixer *am = (struct alsa_mixer *)data;
+
+	assert(am->handle != NULL);
+
+	g_source_destroy(&am->source->source);
+	g_source_unref(&am->source->source);
+
+	snd_mixer_elem_set_callback(am->elem, NULL);
+	snd_mixer_close(am->handle);
 }
 
 static int
diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c
index 418068ac2..608f1f9b8 100644
--- a/src/mixer/oss_mixer_plugin.c
+++ b/src/mixer/oss_mixer_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer/pulse_mixer_plugin.c b/src/mixer/pulse_mixer_plugin.c
index 2be0b8266..a82c032b3 100644
--- a/src/mixer/pulse_mixer_plugin.c
+++ b/src/mixer/pulse_mixer_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -191,13 +191,13 @@ pulse_mixer_get_volume(struct mixer *mixer, G_GNUC_UNUSED GError **error_r)
 	struct pulse_mixer *pm = (struct pulse_mixer *) mixer;
 	int ret;
 
-	pa_threaded_mainloop_lock(pm->output->mainloop);
+	pulse_output_lock(pm->output);
 
 	ret = pm->online
 		? (int)((100*(pa_cvolume_avg(&pm->volume)+1))/PA_VOLUME_NORM)
 		: -1;
 
-	pa_threaded_mainloop_unlock(pm->output->mainloop);
+	pulse_output_unlock(pm->output);
 
 	return ret;
 }
@@ -209,9 +209,10 @@ pulse_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
 	struct pa_cvolume cvolume;
 	bool success;
 
-	pa_threaded_mainloop_lock(pm->output->mainloop);
+	pulse_output_lock(pm->output);
+
 	if (!pm->online) {
-		pa_threaded_mainloop_unlock(pm->output->mainloop);
+		pulse_output_unlock(pm->output);
 		g_set_error(error_r, pulse_mixer_quark(), 0, "disconnected");
 		return false;
 	}
@@ -221,7 +222,8 @@ pulse_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
 	success = pulse_output_set_volume(pm->output, &cvolume, error_r);
 	if (success)
 		pm->volume = cvolume;
-	pa_threaded_mainloop_unlock(pm->output->mainloop);
+
+	pulse_output_unlock(pm->output);
 
 	return success;
 }
diff --git a/src/mixer/pulse_mixer_plugin.h b/src/mixer/pulse_mixer_plugin.h
index be199f688..461633d37 100644
--- a/src/mixer/pulse_mixer_plugin.h
+++ b/src/mixer/pulse_mixer_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer/roar_mixer_plugin.c b/src/mixer/roar_mixer_plugin.c
new file mode 100644
index 000000000..47d3c17f9
--- /dev/null
+++ b/src/mixer/roar_mixer_plugin.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2010-2011 Philipp 'ph3-der-loewe' Schafft
+ * Copyright (C) 2010-2011 Hans-Kristian 'maister' Arntzen
+ *
+ * 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_api.h"
+#include "output_api.h"
+#include "output/roar_output_plugin.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+typedef struct roar_mpd_mixer
+{
+	/** the base mixer class */
+	struct mixer base;
+	struct roar *self;
+} roar_mixer_t;
+
+/**
+ * The quark used for GError.domain.
+ */
+static inline GQuark
+roar_mixer_quark(void)
+{
+	return g_quark_from_static_string("roar_mixer");
+}
+
+static struct mixer *
+roar_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param,
+		G_GNUC_UNUSED GError **error_r)
+{
+	roar_mixer_t *self = g_new(roar_mixer_t, 1);
+	self->self = ao;
+
+	mixer_init(&self->base, &roar_mixer_plugin);
+
+	return &self->base;
+}
+
+static void
+roar_mixer_finish(struct mixer *data)
+{
+	roar_mixer_t *self = (roar_mixer_t *) data;
+
+	g_free(self);
+}
+
+static void
+roar_mixer_close(G_GNUC_UNUSED struct mixer *data)
+{
+}
+
+static bool
+roar_mixer_open(G_GNUC_UNUSED struct mixer *data,
+		G_GNUC_UNUSED GError **error_r)
+{
+	return true;
+}
+
+static int
+roar_mixer_get_volume(struct mixer *mixer, G_GNUC_UNUSED GError **error_r)
+{
+	roar_mixer_t *self = (roar_mixer_t *)mixer;
+	return roar_output_get_volume(self->self);
+}
+
+static bool
+roar_mixer_set_volume(struct mixer *mixer, unsigned volume,
+		G_GNUC_UNUSED GError **error_r)
+{
+	roar_mixer_t *self = (roar_mixer_t *)mixer;
+	return roar_output_set_volume(self->self, volume);
+}
+
+const struct mixer_plugin roar_mixer_plugin = {
+	.init = roar_mixer_init,
+	.finish = roar_mixer_finish,
+	.open = roar_mixer_open,
+	.close = roar_mixer_close,
+	.get_volume = roar_mixer_get_volume,
+	.set_volume = roar_mixer_set_volume,
+	.global = false,
+};
diff --git a/src/mixer/software_mixer_plugin.c b/src/mixer/software_mixer_plugin.c
index 93802e977..0206c3b99 100644
--- a/src/mixer/software_mixer_plugin.c
+++ b/src/mixer/software_mixer_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer/software_mixer_plugin.h b/src/mixer/software_mixer_plugin.h
index 3bd07ac62..ee2b2023c 100644
--- a/src/mixer/software_mixer_plugin.h
+++ b/src/mixer/software_mixer_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer/winmm_mixer_plugin.c b/src/mixer/winmm_mixer_plugin.c
index 5ab3e7525..ceddf6afd 100644
--- a/src/mixer/winmm_mixer_plugin.c
+++ b/src/mixer/winmm_mixer_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_all.c b/src/mixer_all.c
index ffe610b91..95ba90793 100644
--- a/src/mixer_all.c
+++ b/src/mixer_all.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_all.h b/src/mixer_all.h
index cece23292..fe873e713 100644
--- a/src/mixer_all.h
+++ b/src/mixer_all.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_api.c b/src/mixer_api.c
index 4c8959fb8..c85916c94 100644
--- a/src/mixer_api.c
+++ b/src/mixer_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_api.h b/src/mixer_api.h
index 26c001703..29c1e00ca 100644
--- a/src/mixer_api.h
+++ b/src/mixer_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_control.c b/src/mixer_control.c
index 458b3abc1..3e984dd04 100644
--- a/src/mixer_control.c
+++ b/src/mixer_control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_control.h b/src/mixer_control.h
index 1f48e8ca5..6c3468aca 100644
--- a/src/mixer_control.h
+++ b/src/mixer_control.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_list.h b/src/mixer_list.h
index a472c8807..078358ec3 100644
--- a/src/mixer_list.h
+++ b/src/mixer_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 extern const struct mixer_plugin software_mixer_plugin;
 extern const struct mixer_plugin alsa_mixer_plugin;
 extern const struct mixer_plugin oss_mixer_plugin;
+extern const struct mixer_plugin roar_mixer_plugin;
 extern const struct mixer_plugin pulse_mixer_plugin;
 extern const struct mixer_plugin winmm_mixer_plugin;
 
diff --git a/src/mixer_plugin.h b/src/mixer_plugin.h
index 0915a03f3..9532b95cb 100644
--- a/src/mixer_plugin.h
+++ b/src/mixer_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ struct mixer_plugin {
 	 * @param ao the pointer returned by audio_output_plugin.init
 	 * @param param the configuration section, or NULL if there is
 	 * no configuration
-	 * @param error_r location to store the error occuring, or
+	 * @param error_r location to store the error occurring, or
 	 * NULL to ignore errors
 	 * @return a mixer object, or NULL on error
 	 */
@@ -56,7 +56,7 @@ struct mixer_plugin {
 	/**
 	 * Open mixer device
 	 *
-	 * @param error_r location to store the error occuring, or
+	 * @param error_r location to store the error occurring, or
 	 * NULL to ignore errors
 	 * @return true on success, false on error
 	 */
@@ -70,7 +70,7 @@ struct mixer_plugin {
 	/**
 	 * Reads the current volume.
 	 *
-	 * @param error_r location to store the error occuring, or
+	 * @param error_r location to store the error occurring, or
 	 * NULL to ignore errors
 	 * @return the current volume (0..100 including) or -1 if
 	 * unavailable or on error (error_r set, mixer will be closed)
@@ -80,7 +80,7 @@ struct mixer_plugin {
 	/**
 	 * Sets the volume.
 	 *
-	 * @param error_r location to store the error occuring, or
+	 * @param error_r location to store the error occurring, or
 	 * NULL to ignore errors
 	 * @param volume the new volume (0..100 including)
 	 * @return true on success, false on error
diff --git a/src/mixer_type.c b/src/mixer_type.c
index 4f347dd94..a479caf16 100644
--- a/src/mixer_type.c
+++ b/src/mixer_type.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mixer_type.h b/src/mixer_type.h
index fd1c5576c..15d136b5b 100644
--- a/src/mixer_type.h
+++ b/src/mixer_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify