system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 17:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winealsa: Add special case for microphone source in mixer.

Browse source 
Some microphones don't have a capture control, but a playback control
instead. So use the playback volume, but still register it as capture
volume.
This commit is contained in:
Maarten Lankhorst 2007-12-24 14:59:59 +01:00 committed by Alexandre Julliard
parent 82a199bcee
commit 7034b92d90
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/winealsa.drv/mixer.c
View file

@ -371,7 +371,8 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_
const char * name = snd_mixer_selem_get_name(elem);
DWORD comp = getcomponenttype(name);
if (snd_mixer_selem_has_playback_volume(elem))
if (snd_mixer_selem_has_playback_volume(elem) &&
(snd_mixer_selem_has_capture_volume(elem) || comp != MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE))
{
(++mline)->component = comp;
MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN);
@ -382,7 +383,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_
else if (!capt)
continue;
if (capt && snd_mixer_selem_has_capture_volume(elem))
if (capt && (snd_mixer_selem_has_capture_volume(elem) || comp == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE))
{
(++mline)->component = comp;
MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN);
@ -473,9 +474,19 @@ static void ALSA_MixerInit(void)
captelem = elem;
else if (!blacklisted(elem))
{
DWORD comp = getcomponenttype(snd_mixer_selem_get_name(elem));
DWORD skip = 0;
/* Work around buggy drivers: Make this a capture control if the name is recognised as a microphone */
if (snd_mixer_selem_has_capture_volume(elem))
++capcontrols;
if (snd_mixer_selem_has_playback_volume(elem))
else if (comp == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE)
{
++capcontrols;
skip = 1;
}
if (!skip && snd_mixer_selem_has_playback_volume(elem))
{
if (!strcasecmp(snd_mixer_selem_get_name(elem), "Headphone") && !headelem)
headelem = elem;