Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 16:49:41 +02:00
Code Issues Releases Wiki Activity

bug 11 followup: DeviceToolBar - for Win DirectSound and MME don't allow input source lookup for the mapper devices.

Browse Source 
This is kind of a hack that relies upon portaudio to make the first index the mapper for these apis.  I verified this for MME in portaudio src, but could not for DirectSound, so this may need to be reverted.
Should address gale's issues on win xp.
This commit is contained in:
mchinen 2011-02-05 19:07:02 +00:00
parent 443c678e78
commit 046593405f
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/toolbars/DeviceToolBar.cpp
View File

@ -150,6 +150,25 @@ static void AddSourcesFromStream(int deviceIndex, const PaDeviceInfo *info, std:
Px_CloseMixer(portMixer);
}
static bool IsInputDeviceAMapperDevice(const PaDeviceInfo *info)
{
// For Windows only, portaudio returns the default mapper object
// as the first index after a new hostApi index is detected (true for MME and DS)
// this is a bit of a hack, but there's no other way to find out which device is a mapper,
// I've looked at string comparisons, but if the system is in a different language this breaks.
#ifdef __WXMSW__
static int lastHostApiTypeId = -1;
int hostApiTypeId = Pa_GetHostApiInfo(info->hostApi)->type;
if(hostApiTypeId != lastHostApiTypeId &&
(hostApiTypeId == paMME || hostApiTypeId == paDirectSound)) {
lastHostApiTypeId = hostApiTypeId;
return true;
}
#endif
return false;
}
static void AddSources(int deviceIndex, int rate, wxArrayString *hosts, std::vector<DeviceSourceMap> *maps, int isInput)
{
int error = 0;
@ -174,7 +193,8 @@ static void AddSources(int deviceIndex, int rate, wxArrayString *hosts, std::vec
// and some platforms (e.g. XP) have the same device for input and output, (while
// Vista/Win7 seperate these into two devices with the same names (but different
// portaudio indecies)
if (isInput) {
// Also, for mapper devices we don't want to keep any sources, so check for it here
if (isInput && !IsInputDeviceAMapperDevice(info)) {
if (info)
parameters.suggestedLatency = info->defaultLowInputLatency;
else