1 files changed, 30 insertions, 12 deletions

diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c
index fb0fd787e..3b97e38f5 100644
--- a/src/mixer/oss_mixer_plugin.c
+++ b/src/mixer/oss_mixer_plugin.c
@@ -49,6 +49,15 @@ struct oss_mixer {
 	int volume_control;
 };
 
+/**
+ * The quark used for GError.domain.
+ */
+static inline GQuark
+oss_mixer_quark(void)
+{
+	return g_quark_from_static_string("oss_mixer");
+}
+
 static int
 oss_find_mixer(const char *name)
 {
@@ -65,7 +74,7 @@ oss_find_mixer(const char *name)
 }
 
 static struct mixer *
-oss_mixer_init(const struct config_param *param)
+oss_mixer_init(const struct config_param *param, GError **error_r)
 {
 	struct oss_mixer *om = g_new(struct oss_mixer, 1);
 
@@ -78,9 +87,9 @@ oss_mixer_init(const struct config_param *param)
 	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);
+			g_set_error(error_r, oss_mixer_quark(), 0,
+				    "no such mixer control: %s", om->control);
 			return NULL;
 		}
 	} else
@@ -108,13 +117,15 @@ oss_mixer_close(struct mixer *data)
 }
 
 static bool
-oss_mixer_open(struct mixer *data)
+oss_mixer_open(struct mixer *data, GError **error_r)
 {
 	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);
+		g_set_error(error_r, oss_mixer_quark(), errno,
+			    "failed to open %s: %s",
+			    om->device, g_strerror(errno));
 		return false;
 	}
 
@@ -122,14 +133,17 @@ oss_mixer_open(struct mixer *data)
 		int devmask = 0;
 
 		if (ioctl(om->device_fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
-			g_warning("errors getting read_devmask for oss mixer\n");
+			g_set_error(error_r, oss_mixer_quark(), errno,
+				    "READ_DEVMASK failed: %s",
+				    g_strerror(errno));
 			oss_mixer_close(data);
 			return false;
 		}
 
 		if (((1 << om->volume_control) & devmask) == 0) {
-			g_warning("mixer control \"%s\" not usable\n",
-				om->control);
+			g_set_error(error_r, oss_mixer_quark(), 0,
+				    "mixer control \"%s\" not usable",
+				    om->control);
 			oss_mixer_close(data);
 			return false;
 		}
@@ -138,7 +152,7 @@ oss_mixer_open(struct mixer *data)
 }
 
 static int
-oss_mixer_get_volume(struct mixer *mixer)
+oss_mixer_get_volume(struct mixer *mixer, GError **error_r)
 {
 	struct oss_mixer *om = (struct oss_mixer *)mixer;
 	int left, right, level;
@@ -148,7 +162,9 @@ oss_mixer_get_volume(struct mixer *mixer)
 
 	ret = ioctl(om->device_fd, MIXER_READ(om->volume_control), &level);
 	if (ret < 0) {
-		g_warning("unable to read oss volume\n");
+		g_set_error(error_r, oss_mixer_quark(), errno,
+			    "failed to read OSS volume: %s",
+			    g_strerror(errno));
 		return false;
 	}
 
@@ -164,7 +180,7 @@ oss_mixer_get_volume(struct mixer *mixer)
 }
 
 static bool
-oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
+oss_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
 {
 	struct oss_mixer *om = (struct oss_mixer *)mixer;
 	int level;
@@ -177,7 +193,9 @@ oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
 
 	ret = ioctl(om->device_fd, MIXER_WRITE(om->volume_control), &level);
 	if (ret < 0) {
-		g_warning("unable to set oss volume\n");
+		g_set_error(error_r, oss_mixer_quark(), errno,
+			    "failed to set OSS volume: %s",
+			    g_strerror(errno));
 		return false;
 	}