ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xaudio2: Implement IXAudio2SourceVoice frequency functions. 

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
This commit is contained in:
Andrew Eikum 2015-09-25 12:39:40 -05:00 committed by Alexandre Julliard
parent 80be4dad87
commit eae93c1f41
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/xaudio2_7/tests/xaudio2.c
View File

@ -467,6 +467,14 @@ static void test_buffer_callbacks(IXAudio2 *xa)
XA2CALL_0(StartEngine);
ok(hr == S_OK, "StartEngine failed: %08x\n", hr);
if(xaudio27){
hr = IXAudio27SourceVoice_SetSourceSampleRate((IXAudio27SourceVoice*)src, 48000);
todo_wine ok(hr == S_OK, "SetSourceSampleRate failed: %08x\n", hr);
}else{
hr = IXAudio2SourceVoice_SetSourceSampleRate(src, 48000);
ok(hr == XAUDIO2_E_INVALID_CALL, "SetSourceSampleRate should have failed: %08x\n", hr);
}
while(1){
if(xaudio27)
IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state);

31
dlls/xaudio2_7/xaudio_dll.c
View File

@ -797,14 +797,32 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface,
float Ratio, UINT32 OperationSet)
{
XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface);
ALfloat r;
TRACE("%p, %f, 0x%x\n", This, Ratio, OperationSet);
if(Ratio < XAUDIO2_MIN_FREQ_RATIO)
r = XAUDIO2_MIN_FREQ_RATIO;
else if (Ratio > XAUDIO2_MAX_FREQ_RATIO)
r = XAUDIO2_MAX_FREQ_RATIO;
else
r = Ratio;
alSourcef(This->al_src, AL_PITCH, r);
return S_OK;
}
static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *pRatio)
{
ALfloat ratio;
XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface);
TRACE("%p, %p\n", This, pRatio);
alGetSourcef(This->al_src, AL_PITCH, &ratio);
*pRatio = ratio;
}
static HRESULT WINAPI XA2SRC_SetSourceSampleRate(
@ -812,7 +830,20 @@ static HRESULT WINAPI XA2SRC_SetSourceSampleRate(
UINT32 NewSourceSampleRate)
{
XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface);
TRACE("%p, %u\n", This, NewSourceSampleRate);
EnterCriticalSection(&This->lock);
if(This->nbufs){
LeaveCriticalSection(&This->lock);
return XAUDIO2_E_INVALID_CALL;
}
This->fmt->nSamplesPerSec = NewSourceSampleRate;
LeaveCriticalSection(&This->lock);
return S_OK;
}