diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 05:27:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 05:27:28 (GMT) |
| commit | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (patch) | |
| tree | 3c362ab47af7b19be6351315b8e34e538b23c319 /src/multimedia/audio/qaudioinput_win32_p.h | |
| parent | 7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb (diff) | |
| parent | 544bbfadc0703597b7084213261053ca0e2facf6 (diff) | |
| download | Qt-64a360f45ab9a1c50ca628cfd6b670b93816c756.zip Qt-64a360f45ab9a1c50ca628cfd6b670b93816c756.tar.gz Qt-64a360f45ab9a1c50ca628cfd6b670b93816c756.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Corruption in data captured by QAudioInput
Just one (static) waveInCriticalSection but multiple QAudioInput to
Mismatch between reported and actual supported sample rates in
Diffstat (limited to 'src/multimedia/audio/qaudioinput_win32_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index d555eff..a12c75e 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -122,6 +122,8 @@ private: volatile int waveFreeBlockCount; int waveCurrentBlock; + CRITICAL_SECTION waveInCriticalSection; + static void CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); |