diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-03-11 09:01:37 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-03-11 09:01:37 +0000 |
| commit | 36a843032b4e28aa294ce0795fd96d76c57e3304 (patch) | |
| tree | 93115cf356b213777d0b759ad658658b5ab4ad48 /src | |
| parent | 0c2ef2e2944056f387121ec8e3a3382f73486ebc (diff) | |
| download | xine-lib-36a843032b4e28aa294ce0795fd96d76c57e3304.tar.gz xine-lib-36a843032b4e28aa294ce0795fd96d76c57e3304.tar.bz2 | |
Fix muting set volume to 0 bug.
CVS patchset: 1553
CVS date: 2002/03/11 09:01:37
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index e6baaffa6..553425927 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_oss_out.c,v 1.57 2002/02/11 13:00:46 richwareham Exp $ + * $Id: audio_oss_out.c,v 1.58 2002/03/11 09:01:37 f1rmb Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -442,29 +442,30 @@ static int ao_oss_get_property (ao_driver_t *this_gen, int property) { switch(property) { case AO_PROP_PCM_VOL: case AO_PROP_MIXER_VOL: - mixer_fd = open(this->mixer.name, O_RDONLY); - if(mixer_fd != -1) { - int cmd = 0; - int v; - - ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, &audio_devs); - - if(audio_devs & SOUND_MASK_PCM) - cmd = SOUND_MIXER_READ_PCM; - else if(audio_devs & SOUND_MASK_VOLUME) - cmd = SOUND_MIXER_READ_VOLUME; - else { + if(!this->mixer.mute) { + mixer_fd = open(this->mixer.name, O_RDONLY); + if(mixer_fd != -1) { + int cmd = 0; + int v; + + ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, &audio_devs); + + if(audio_devs & SOUND_MASK_PCM) + cmd = SOUND_MIXER_READ_PCM; + else if(audio_devs & SOUND_MASK_VOLUME) + cmd = SOUND_MIXER_READ_VOLUME; + else { + close(mixer_fd); + return 0; + } + ioctl(mixer_fd, cmd, &v); + this->mixer.volume = (((v & 0xFF00) >> 8) + (v & 0x00FF)) / 2; close(mixer_fd); - return 0; } - ioctl(mixer_fd, cmd, &v); - this->mixer.volume = (((v & 0xFF00) >> 8) + (v & 0x00FF)) / 2; - close(mixer_fd); + else + printf("%s(): open() %s failed: %s\n", + __XINE_FUNCTION__, this->mixer.name, strerror(errno)); } - else - printf("%s(): open() %s failed: %s\n", - __XINE_FUNCTION__, this->mixer.name, strerror(errno)); - return this->mixer.volume; break; @@ -486,7 +487,6 @@ static int ao_oss_set_property (ao_driver_t *this_gen, int property, int value) case AO_PROP_PCM_VOL: case AO_PROP_MIXER_VOL: if(!this->mixer.mute) { - mixer_fd = open(this->mixer.name, O_RDONLY); if(mixer_fd != -1) { |