X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_mix.c;fp=alsa_mix.c;h=c860efc8aa34d9776f52375d87c4d9cb43ad3c27;hp=0c2a1cf80725937ce87beb73bf1e08f930d50d36;hb=bfdd36f2879b8dee1f6d3330bc49fbb5644d3caf;hpb=6fb1fc05a236d8732b0ae9581cc84d9958b3af76 diff --git a/alsa_mix.c b/alsa_mix.c index 0c2a1cf8..c860efc8 100644 --- a/alsa_mix.c +++ b/alsa_mix.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 Andre Noll + * Copyright (C) 2012-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -141,19 +141,19 @@ 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; + return -E_BAD_CHANNEL; } 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; + return -E_ALSA_MIX_RANGE; } 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; + return -E_ALSA_MIX_RANGE; } return 1; }