Update of /cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/wasapi
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29383/lib-src/portaudio-v19/src/hostapi/wasapi
Modified Files:
pa_win_wasapi.cpp
Log Message:
Update portaudio-v19 to current portaudio SVN version, r1414
Index: pa_win_wasapi.cpp
===================================================================
RCS file:
/cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pa_win_wasapi.cpp 31 Dec 2008 15:38:35 -0000 1.7
+++ pa_win_wasapi.cpp 25 May 2009 21:40:16 -0000 1.8
@@ -518,7 +518,7 @@
if (value.pwszVal)
wcstombs(deviceName,
value.pwszVal,MAX_STR_LEN-1); //todo proper size
else{
-
sprintf(deviceName,"baddev%d",i);
+
_snprintf_s(deviceName,MAX_STR_LEN-1,MAX_STR_LEN-1,"baddev%d",i);
}
deviceInfo->name = deviceName;
@@ -956,9 +956,9 @@
HRESULT hResult=!S_OK;
if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
- hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)outWavex,NULL);
+ hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&outWavex->Format,NULL);
else
- hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
(WAVEFORMATEX*)&outWavex,&sharedClosestMatch);
+ hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
&outWavex->Format,&sharedClosestMatch);
if (hResult == S_OK)
answer = paFormatIsSupported;
@@ -990,9 +990,9 @@
WAVEFORMATEXTENSIBLE ext;
wasapiFillWFEXT(&ext,BestToWorst[i],sampleRate,params->channelCount);
if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
- hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&ext,NULL);
+ hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&ext.Format,NULL);
else
- hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
(WAVEFORMATEX*)&ext,&sharedClosestMatch);
+ hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
&ext.Format,&sharedClosestMatch);
if (hResult == S_OK){
memcpy(outWavex,&ext,sizeof(WAVEFORMATEXTENSIBLE));
@@ -1015,9 +1015,9 @@
pcm16WaveFormat.cbSize = 0;
if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
- hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&pcm16WaveFormat,NULL);
+ hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&pcm16WaveFormat,NULL);
else
- hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
(WAVEFORMATEX*)&pcm16WaveFormat,&sharedClosestMatch);
+ hResult =
myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,
&pcm16WaveFormat,&sharedClosestMatch);
if (hResult == S_OK){
memcpy(outWavex,&pcm16WaveFormat,sizeof(WAVEFORMATEX));
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
