diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-09 12:23:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-09 12:23:53 (GMT) |
| commit | 850c3f7d9bb5fbad041dd935d1d53c5d49db0163 (patch) | |
| tree | 3ebb00088919d21c51c34b3c002c41b3fd1bedbe /src/multimedia/audio/qaudiooutput_win32_p.h | |
| parent | 19a566f82a7c684423331a8caab70ec594afd1ce (diff) | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| download | Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.zip Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.gz Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_win32_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h index bb176a0..68a40f7 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/audio/qaudiooutput_win32_p.h @@ -119,6 +119,8 @@ private: static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); + CRITICAL_SECTION waveOutCriticalSection; + WAVEHDR* allocateBlocks(int size, int count); void freeBlocks(WAVEHDR* blockArray); bool open(); |