libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-13 04:29:09 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: mixer: Fix volume control for no WAVECAPS_LRVOLUME device

Browse Source 
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>
This commit is contained in:
Takashi Yano 2024-06-01 15:23:37 +09:00
parent 14216d5442
commit e567e9f7c3
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/autoload.cc
View File

@ -600,6 +600,8 @@ LoadDLLfuncEx3 (waveOutReset, winmm, 1, 0, 1)
LoadDLLfuncEx3 (waveOutSetVolume, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveOutSetVolume, winmm, 1, 0, 1)
LoadDLLfuncEx3 (waveOutUnprepareHeader, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveOutUnprepareHeader, winmm, 1, 0, 1)
LoadDLLfuncEx3 (waveOutWrite, 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 (accept, ws2_32)
LoadDLLfunc (bind, ws2_32) LoadDLLfunc (bind, ws2_32)

14
winsup/cygwin/fhandler/mixer.cc
View File

@ -15,6 +15,7 @@ details. */
#include "fhandler.h" #include "fhandler.h"
#include "dtable.h" #include "dtable.h"
#include "cygheap.h" #include "cygheap.h"
#include <mmddk.h>
ssize_t ssize_t
fhandler_dev_mixer::write (const void *ptr, size_t len) fhandler_dev_mixer::write (const void *ptr, size_t len)
@ -88,7 +89,9 @@ int
fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf) fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf)
{ {
int ret = 0; int ret = 0;
DWORD id, flag;
DWORD vol; DWORD vol;
WAVEOUTCAPS woc;
switch (cmd) switch (cmd)
{ {
case SOUND_MIXER_READ_DEVMASK: case SOUND_MIXER_READ_DEVMASK:
@ -115,7 +118,12 @@ fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf)
*(int *) buf = 1 << rec_source; *(int *) buf = 1 << rec_source;
break; break;
case MIXER_WRITE (SOUND_MIXER_VOLUME): 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); 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) if (waveOutSetVolume ((HWAVEOUT)WAVE_MAPPER, vol) != MMSYSERR_NOERROR)
{ {
set_errno (EINVAL); set_errno (EINVAL);
@ -123,13 +131,17 @@ fhandler_dev_mixer::ioctl (unsigned int cmd, void *buf)
} }
break; break;
case MIXER_READ (SOUND_MIXER_VOLUME): 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) if (waveOutGetVolume ((HWAVEOUT)WAVE_MAPPER, &vol) != MMSYSERR_NOERROR)
{ {
set_errno (EINVAL); set_errno (EINVAL);
ret = -1; ret = -1;
break; break;
} }
if (!(woc.dwSupport & WAVECAPS_LRVOLUME))
vol |= (vol & 0xffff) << 16;
*(int *) buf = volume_winmm_to_oss (vol); *(int *) buf = volume_winmm_to_oss (vol);
break; break;
default: default: