diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
| commit | 0f790634c57400f4ddffd36f5e3443c712d1a1c3 (patch) | |
| tree | 2b9f01a1798c5700f3c82e72a3db97dac6a625d5 /src/multimedia/audio/qaudioinput_win32_p.h | |
| parent | 67e8e5baeec38d592596f259894e6dda420728ea (diff) | |
| parent | 119d7dddc8da189ccd1cbc55ed3292f311c30e0c (diff) | |
| download | Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.zip Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.gz Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/multimedia/audio/qaudioinput_win32_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index a2cf2ea..66c2535 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -122,6 +122,7 @@ private: volatile int waveFreeBlockCount; int waveCurrentBlock; + CRITICAL_SECTION waveInCriticalSection; static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); |