summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiooutput_win32_p.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-04 08:48:39 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-01-04 08:48:39 (GMT)
commitc855c61ed5c80a97f3a2858a15453f9e041db7f8 (patch)
tree68b86fe5adc7a5c19a237ee1e5bba147ccf92f23 /src/multimedia/audio/qaudiooutput_win32_p.cpp
parent65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25 (diff)
parent06bdf48e9194d73075041efecde5c70a144d6927 (diff)
downloadQt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.zip
Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.gz
Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_win32_p.cpp')
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 2cfc472..02c8cfe 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -147,6 +147,14 @@ WAVEHDR* QAudioOutputPrivate::allocateBlocks(int size, int count)
void QAudioOutputPrivate::freeBlocks(WAVEHDR* blockArray)
{
+ WAVEHDR* blocks = blockArray;
+
+ int count = buffer_size/period_size;
+
+ for(int i = 0; i < count; i++) {
+ waveOutUnprepareHeader(hWaveOut,&blocks[i], sizeof(WAVEHDR));
+ blocks+=sizeof(WAVEHDR);
+ }
HeapFree(GetProcessHeap(), 0, blockArray);
}