summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-11-28 08:03:23 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-11-28 08:03:23 +0000
commit87d6350fbba837a926a0f08a808e44c2b88fb66c (patch)
treeb453f82beff1cc8e92d41f8d8ad4a2792026c3e9
parente9bd65143eaa8aad3742269da172995ec2972ba2 (diff)
downloadxine-lib-87d6350fbba837a926a0f08a808e44c2b88fb66c.tar.gz
xine-lib-87d6350fbba837a926a0f08a808e44c2b88fb66c.tar.bz2
fix reading out mixer setting
CVS patchset: 3385 CVS date: 2002/11/28 08:03:23
-rw-r--r--src/audio_out/audio_oss_out.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index fec8cacec..ae5a4d74e 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.82 2002/11/20 11:57:40 mroi Exp $
+ * $Id: audio_oss_out.c,v 1.83 2002/11/28 08:03:23 guenter Exp $
*
* 20-8-2001 First implementation of Audio sync and Audio driver separation.
* Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -503,11 +503,11 @@ static int ao_oss_get_property (ao_driver_t *this_gen, int property) {
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("audio_oss_out: open() %s failed: %s\n",
+ this->mixer.name, strerror(errno));
return -1;
+ }
}
return this->mixer.volume;
break;