diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2024-06-01 15:23:37 +0900 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2024-06-01 15:23:37 +0900 |
| commit | abfa508e727b5547a0c0624229546dd068b12ad1 (patch) | |
| tree | 5ba3ca3493b82c65f6ae2107ba763779a1d0d110 /winsup/cygwin | |
| parent | 2c338fd7d8e90f11f15d7035da81b7bb51032b4b (diff) | |
| download | newlib-abfa508e727b5547a0c0624229546dd068b12ad1.zip newlib-abfa508e727b5547a0c0624229546dd068b12ad1.tar.gz newlib-abfa508e727b5547a0c0624229546dd068b12ad1.tar.bz2 | |
Cygwin: mixer: Fix volume control for no WAVECAPS_LRVOLUME device
Currently, if the device does not have capability WAVECAPS_LRVOLUME,
the volume control does not work properly. This patch fixes that.
Fixes: 2a4af3661470 ("Cygwin: Implement sound mixer device.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/autoload.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler/mixer.cc | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index c262c7e..7e882ef 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -603,6 +603,8 @@ LoadDLLfuncEx3 (waveOutReset, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveOutSetVolume, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveOutUnprepareHeader, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveOutWrite, winmm, 1, 0, 1) +LoadDLLfuncEx3 (waveOutMessage, winmm, 1, 0, 1) +LoadDLLfuncEx3 (waveOutGetDevCapsA, winmm, 1, 0, 1) LoadDLLfunc (accept, ws2_32) LoadDLLfunc (bind, ws2_32) diff --git a/winsup/cygwin/fhandler/mixer.cc b/winsup/cygwin/fhandler/mixer.cc index fabd397..f4997f9 100644 --- a/winsup/cygwin/fhandler/mixer.cc +++ b/winsup/cygwin/fhandler/mixer.cc @@ -15,6 +15,7 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" +#include <mmddk.h> ssize_t fhandler_dev_mixer::write (const void *ptr, size_t len) @@ -88,7 +89,9 @@ int fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf) { int ret = 0; + DWORD id, flag; DWORD vol; + WAVEOUTCAPS woc; switch (cmd) { case SOUND_MIXER_READ_DEVMASK: @@ -115,7 +118,12 @@ fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf) *(int *) buf = 1 << rec_source; break; case MIXER_WRITE (SOUND_MIXER_VOLUME): + waveOutMessage ((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&id, (DWORD_PTR)&flag); + waveOutGetDevCaps ((UINT)id, &woc, sizeof (woc)); vol = volume_oss_to_winmm (*(int *) buf); + if (!(woc.dwSupport & WAVECAPS_LRVOLUME)) + vol = max(vol & 0xffff, (vol >> 16) & 0xffff); if (waveOutSetVolume ((HWAVEOUT)WAVE_MAPPER, vol) != MMSYSERR_NOERROR) { set_errno (EINVAL); @@ -123,13 +131,17 @@ fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf) } break; case MIXER_READ (SOUND_MIXER_VOLUME): - DWORD vol; + waveOutMessage ((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&id, (DWORD_PTR)&flag); + waveOutGetDevCaps ((UINT)id, &woc, sizeof (woc)); if (waveOutGetVolume ((HWAVEOUT)WAVE_MAPPER, &vol) != MMSYSERR_NOERROR) { set_errno (EINVAL); ret = -1; break; } + if (!(woc.dwSupport & WAVECAPS_LRVOLUME)) + vol |= (vol & 0xffff) << 16; *(int *) buf = volume_winmm_to_oss (vol); break; default: |