Evilly merge tag 'wine-1.5.11' into dsoal
[wine/multimedia.git] / dlls / dsound / dsp / 0020_dsound:_Remove_forcing_frequency_on_primary_buffer.patch
blobfcfea97363e97aa900f624dbfa5c4354035aabfc
1 commit 98989c7991478bd14498a3651f8bae9c2d32393c
2 Author: Maarten Lankhorst <m.b.lankhorst@gmail.com>
3 Date: Tue Apr 12 00:25:33 2011 +0200
5 dsound: Remove forcing frequency on primary buffer
7 diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
8 index 5209dc1..f186705 100644
9 --- a/dlls/dsound/primary.c
10 +++ b/dlls/dsound/primary.c
11 @@ -699,20 +699,8 @@ static HRESULT WINAPI DS8Primary_SetFormat(IDirectSoundBuffer *iface, const WAVE
13 else
15 - ALCint freq;
17 copy_waveformat(This->format, wfx);
19 - setALContext(This->ctx);
21 - freq = This->format->nSamplesPerSec;
22 - palcGetIntegerv(This->parent->device, ALC_FREQUENCY, 1, &freq);
23 - getALCError(This->parent->device);
25 - This->format->nSamplesPerSec = freq;
26 - This->format->nAvgBytesPerSec = This->format->nBlockAlign * This->format->nSamplesPerSec;
28 - popALContext();
29 + WARN("Potentially re-create the device because frequency has changed?\n");
30 hr = S_OK;
32 out: