# HG changeset patch # User John Lindgren # Date 1246489753 14400 # Node ID bbf2cd0df6c32eb18106d674fc4415164a51a75d # Parent 93cf4d0a0dde3219483cd9c29563f7e44fbf3d85 alsa-ng: A gint by any other name... diff -r 93cf4d0a0dde -r bbf2cd0df6c3 src/alsa-ng/alsa-core.c --- a/src/alsa-ng/alsa-core.c Mon Jun 29 23:05:56 2009 -0400 +++ b/src/alsa-ng/alsa-core.c Wed Jul 01 19:09:13 2009 -0400 @@ -171,25 +171,32 @@ alsaplug_get_volume(gint *l, gint *r) { snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer); + long left, right; if (elem == NULL) + { + * l = 50; + * r = 50; return; + } snd_mixer_handle_events(amixer); - *l = 0; - *r = 0; - if (snd_mixer_selem_is_playback_mono(elem)) { - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) l); - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) r); + snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_MONO, & left); + snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_MONO, & right); } else { - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, (glong *) l); - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, (glong *) r); + snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_LEFT, + & left); + snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_RIGHT, + & right); } + + * l = left; + * r = right; } /********************************************************************************