system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 19:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

wineoss.drv: Choose default device using a better method.

Browse source
This commit is contained in:
Andrew Eikum 2011-07-27 12:15:06 -05:00 committed by Alexandre Julliard
parent 96aa86c99d
commit e0f1aa0b05
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dlls/wineoss.drv/mmdevdrv.c
View file

@ -233,7 +233,40 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
return TRUE;
}
HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys,
static UINT get_default_index(EDataFlow flow, char **keys, UINT num)
{
int fd = -1, err, i;
oss_audioinfo ai;
if(flow == eRender)
fd = open("/dev/dsp", O_WRONLY);
else
fd = open("/dev/dsp", O_RDONLY);
if(fd < 0){
WARN("Couldn't open default device!\n");
return 0;
}
ai.dev = -1;
if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){
WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(err));
close(fd);
return 0;
}
close(fd);
TRACE("Default devnode: %s\n", ai.devnode);
for(i = 0; i < num; ++i)
if(!strcmp(ai.devnode, keys[i]))
return i;
WARN("Couldn't find default device! Choosing first.\n");
return 0;
}
HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys,
UINT *num, UINT *def_index)
{
int i, mixer_fd;
@ -282,7 +315,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys,
*keys = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(char *));
*num = 0;
*def_index = -1;
for(i = 0; i < sysinfo.numaudios; ++i){
oss_audioinfo ai = {0};
int fd;
@ -340,18 +372,14 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys,
MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1,
(*ids)[*num], len);
if(ai.caps & PCM_CAP_DEFAULT)
*def_index = *num;
(*num)++;
}
}
if(*def_index == -1)
*def_index = 0;
close(mixer_fd);
*def_index = get_default_index(flow, *keys, *num);
return S_OK;
}