blob: f6892f5909777a909a84c409fe88611c16acc900 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
--- oss_mixer.c.orig 2004-08-19 20:07:27 UTC
+++ oss_mixer.c
@@ -32,6 +32,9 @@
#else
#include <sys/soundcard.h>
#endif
+#if defined(SOUND_MIXER_INFO) && defined(__FreeBSD__)
+#undef SOUND_MIXER_INFO
+#endif
#include "mixer.h"
#include "oss_mixer.h"
@@ -126,7 +129,7 @@ oss_mixer_device_get_volume(mixer_t *mix
long amount;
ioctl(OSSMIXER(mixer)->fd,MIXER_READ(OSSMIXER(mixer)->table[devid]),&amount);
*left = amount & 0xff;
- *right = amount >> 8;
+ *right = (amount >> 8) & 0xff;
}
static void
|
