X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_mix.c;h=cad58af0a9481bd8cb7985cf87b431685f537c01;hp=01f1c51260a7b6753ba8b14aac0c255120b4b331;hb=5ff39998bf0ce71bd8fc8d0f002ceb81b711992f;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9

diff --git a/alsa_mix.c b/alsa_mix.c
index 01f1c512..cad58af0 100644
--- a/alsa_mix.c
+++ b/alsa_mix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -100,11 +100,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 +124,7 @@ static char *alsa_mix_get_channels(struct mixer_handle *handle)
 			name);
 		free(tmp);
 	}
+	snd_mixer_selem_id_free(sid);
 	return list;
 }
 
@@ -133,7 +136,8 @@ 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);
@@ -141,21 +145,27 @@ static int alsa_mix_set_channel(struct mixer_handle *h,
 		PARA_NOTICE_LOG("unable to find simple control '%s',%i\n",
 			snd_mixer_selem_id_get_name(sid),
 			snd_mixer_selem_id_get_index(sid));
-		return -E_ALSA_MIX_BAD_ELEM;
+		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_BAD_ELEM;
+		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_BAD_ELEM;
+		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)