From: dmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Thu, 16 Feb 2012 14:49:28 +0000 (+0000)
Subject: wasapi:
X-Git-Tag: pa_stable_v19_20140130_r1919~86
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=9bc432b603d0257927735d204200102486d7f4bc;p=portaudio

wasapi:
- fixed device name incorrect in case it contains non-Latin characters (thanks to Robert Bielik for proposed solution), now it is converted to UTF-8 encoded string
- fixed damaged audio (pops & clicks) for Input exclusive event-driven mode if specified latency was below 23 ms
---

diff --git a/src/hostapi/wasapi/pa_win_wasapi.c b/src/hostapi/wasapi/pa_win_wasapi.c
index d382432..a6bafdd 100644
--- a/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@ -1248,7 +1248,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
                         goto error;
                     }
 					if (value.pwszVal)
-						wcstombs(deviceName, value.pwszVal, MAX_STR_LEN-1);
+						WideCharToMultiByte(CP_UTF8, 0, value.pwszVal, (int)wcslen(value.pwszVal), deviceName, MAX_STR_LEN-1, 0, 0);
 					else
 						_snprintf(deviceName, MAX_STR_LEN-1, "baddev%d", i);
                     deviceInfo->name = deviceName;
@@ -2211,11 +2211,15 @@ static HRESULT CreateAudioClient(PaWasapiStream *pStream, PaWasapiSubStream *pSu
 	if (framesPerLatency == 0)
 		framesPerLatency = MakeFramesFromHns(pInfo->DefaultDevicePeriod, pSub->wavex.Format.nSamplesPerSec);
 
-	//! Exclusive Input stream renders data in 6 packets, we must set then the size of
-	//! single packet, total buffer size, e.g. required latency will be PacketSize * 6
+	// Exclusive Input stream renders data in 6 packets, we must set then the size of
+	// single packet, total buffer size, e.g. required latency will be PacketSize * 6
 	if (!output && (pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE))
 	{
-		framesPerLatency /= WASAPI_PACKETS_PER_INPUT_BUFFER;
+		// Do it only for Polling mode
+		if ((pSub->streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) == 0)
+		{
+			framesPerLatency /= WASAPI_PACKETS_PER_INPUT_BUFFER;
+		}
 	}
 
 	// Calculate aligned period
@@ -3460,7 +3464,7 @@ static PaError ReadStream( PaStream* s, void *_buffer, unsigned long frames )
 
 		// Limit desired to amount of requested frames
 		desired = available;
-		if (desired > frames)
+		if ((UINT32)desired > frames)
 			desired = frames;
 		
 		// Get pointers to read regions