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

Merge branch 'hotplug' into rb-hotplug-wmme

Browse source
This commit is contained in:
Ross Bencina 2016-09-10 23:47:39 +10:00
commit 042d6c7740
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/pa_front.c
View file

@ -1960,4 +1960,4 @@ PaError Pa_GetSampleSize( PaSampleFormat format )
PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetSampleSize", "int: %d", result ); PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetSampleSize", "int: %d", result );
return (PaError) result; return (PaError) result;
} }

2
src/os/win/pa_win_hotplug.c
View file

@ -326,7 +326,7 @@ void PaUtil_TerminateHotPlug()
PostMessage(s_handler->hWnd, WM_QUIT, 0, 0); PostMessage(s_handler->hWnd, WM_QUIT, 0, 0);
if (WaitForSingleObject(s_handler->hMsgThread, 1000) == WAIT_TIMEOUT) if (WaitForSingleObject(s_handler->hMsgThread, 1000) == WAIT_TIMEOUT)
{ {
TerminateThread(s_handler->hMsgThread, -1); TerminateThread(s_handler->hMsgThread, (DWORD)-1);
} }
} }
DeleteCriticalSection(&s_handler->lock); DeleteCriticalSection(&s_handler->lock);