me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wasapi:

Browse source 
- fixed Windows 7/Server 2008 R2 and Future detection, this fixes minimal/maximal device periods correction
 - added CO_E_NOTINITIALIZED to text errors with action to take for user in case it happens
This commit is contained in:
dmitrykos 2010-04-15 17:15:14 +00:00
commit 8186129234
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/hostapi/wasapi/pa_win_wasapi.c
View file

@ -588,6 +588,9 @@ static HRESULT __LogHostError(HRESULT res, const char *func, const char *file, i
case AUDCLNT_S_THREAD_ALREADY_REGISTERED :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break; case AUDCLNT_S_THREAD_ALREADY_REGISTERED :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break;
case AUDCLNT_S_POSITION_STALLED :text ="AUDCLNT_S_POSITION_STALLED"; break; case AUDCLNT_S_POSITION_STALLED :text ="AUDCLNT_S_POSITION_STALLED"; break;
// other windows common errors:
case CO_E_NOTINITIALIZED :text ="CO_E_NOTINITIALIZED: you must call CoInitialize() before Pa_OpenStream()"; break;
default: default:
text = "UNKNOWN ERROR"; text = "UNKNOWN ERROR";
} }
@ -797,9 +800,11 @@ typedef enum EWindowsVersion
WINDOWS_UNKNOWN = 0, WINDOWS_UNKNOWN = 0,
WINDOWS_VISTA_SERVER2008 = (1 << 0), WINDOWS_VISTA_SERVER2008 = (1 << 0),
WINDOWS_7_SERVER2008R2 = (1 << 1), WINDOWS_7_SERVER2008R2 = (1 << 1),
WINDOWS_7_SERVER2008R2_AND_UP = (1 << 2) WINDOWS_FUTURE = (1 << 2)
} }
EWindowsVersion; EWindowsVersion;
// Defines Windows 7/Windows Server 2008 R2 and up (future versions)
#define WINDOWS_7_SERVER2008R2_AND_UP (WINDOWS_7_SERVER2008R2|WINDOWS_FUTURE)
// The function is limited to Vista/7 mostly as we need just to find out Vista/WOW64 combination // The function is limited to Vista/7 mostly as we need just to find out Vista/WOW64 combination
// in order to use WASAPI WOW64 workarounds. // in order to use WASAPI WOW64 workarounds.
static UINT32 GetWindowsVersion() static UINT32 GetWindowsVersion()
@ -832,6 +837,13 @@ static UINT32 GetWindowsVersion()
switch (dwMajorVersion) switch (dwMajorVersion)
{ {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
break; // skip lower
case 6: case 6:
switch (dwMinorVersion) switch (dwMinorVersion)
{ {
@ -842,8 +854,11 @@ static UINT32 GetWindowsVersion()
version |= WINDOWS_7_SERVER2008R2; version |= WINDOWS_7_SERVER2008R2;
break; break;
default: default:
version |= (WINDOWS_7_SERVER2008R2|WINDOWS_7_SERVER2008R2_AND_UP); version |= WINDOWS_FUTURE;
} }
break;
default:
version |= WINDOWS_FUTURE;
} }
} }