X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_mix.c;h=1d81e5d9dbabbcef772d182eabe6a03ba5a51915;hp=be38e887af9babf8925bcda4d8065a79f991ff7c;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=56df9bb38aa4725f9244a7898d765608d8a1fffa

diff --git a/alsa_mix.c b/alsa_mix.c
index be38e887..1d81e5d9 100644
--- a/alsa_mix.c
+++ b/alsa_mix.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2012-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file alsa_mix.c The ALSA mixer plugin. */
 
@@ -100,11 +96,13 @@ static bool channel_has_playback(snd_mixer_selem_channel_id_t chn,
 
 static char *alsa_mix_get_channels(struct mixer_handle *handle)
 {
+	int ret;
 	char *list = NULL;
 	snd_mixer_selem_id_t *sid;
 	snd_mixer_elem_t *elem;
 
-	snd_mixer_selem_id_alloca(&sid);
+	ret = snd_mixer_selem_id_malloc(&sid);
+	assert(ret >= 0);
 	elem = snd_mixer_first_elem(handle->mixer);
 	for (; elem; elem = snd_mixer_elem_next(elem)) {
 		char *tmp = list;
@@ -122,6 +120,7 @@ static char *alsa_mix_get_channels(struct mixer_handle *handle)
 			name);
 		free(tmp);
 	}
+	snd_mixer_selem_id_free(sid);
 	return list;
 }
 
@@ -133,29 +132,36 @@ static int alsa_mix_set_channel(struct mixer_handle *h,
 
 	if (!mixer_channel)
 		mixer_channel = "Master";
-	snd_mixer_selem_id_alloca(&sid);
+	ret = snd_mixer_selem_id_malloc(&sid);
+	assert(ret >= 0);
 	snd_mixer_selem_id_set_index(sid, selem_id);
 	snd_mixer_selem_id_set_name(sid, mixer_channel);
 	h->elem = snd_mixer_find_selem(h->mixer, sid);
 	if (!h->elem) {
-		PARA_NOTICE_LOG("unable to find simple control '%s',%i\n",
+		PARA_NOTICE_LOG("unable to find simple control '%s',%u\n",
 			snd_mixer_selem_id_get_name(sid),
 			snd_mixer_selem_id_get_index(sid));
-		return -E_BAD_CHANNEL;
+		ret = -E_BAD_CHANNEL;
+		goto out;
 	}
 	ret = snd_mixer_selem_get_playback_volume_range(h->elem,
 		&h->pmin, &h->pmax);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("unable to get %s range (%s): %s\n",
 			mixer_channel, h->card, snd_strerror(ret));
-		return -E_ALSA_MIX_RANGE;
+		ret = -E_ALSA_MIX_RANGE;
+		goto out;
 	}
-	if (h->pmin < 0 || h->pmax < 0 || h->pmin >= h->pmax) {
+	if (h->pmin >= h->pmax) {
 		PARA_NOTICE_LOG("alsa reported %s range %ld-%ld (%s)\n",
 			mixer_channel, h->pmin, h->pmax, h->card);
-		return -E_ALSA_MIX_RANGE;
+		ret = -E_ALSA_MIX_RANGE;
+		goto out;
 	}
-	return 1;
+	ret = 1;
+out:
+	snd_mixer_selem_id_free(sid);
+	return ret;
 }
 
 static int alsa_mix_get(struct mixer_handle *h)
@@ -206,19 +212,13 @@ static int alsa_mix_set(struct mixer_handle *h, int val)
 	return 1;
 }
 
-/**
- * The init function of the ALSA mixer.
- *
- * \param self The structure to initialize.
- *
- * \sa struct \ref mixer, \ref oss_mix_init().
- */
-void alsa_mix_init(struct mixer *self)
-{
-	self->open = alsa_mix_open;
-	self->get_channels = alsa_mix_get_channels;
-	self->set_channel = alsa_mix_set_channel;
-	self->close = alsa_mix_close;
-	self->get = alsa_mix_get;
-	self->set = alsa_mix_set;
-}
+/** The mixer operations for the ALSA mixer. */
+const struct mixer alsa_mixer = {
+	.name = "alsa",
+	.open = alsa_mix_open,
+	.get_channels = alsa_mix_get_channels,
+	.set_channel = alsa_mix_set_channel,
+	.close = alsa_mix_close,
+	.get = alsa_mix_get,
+	.set = alsa_mix_set
+};