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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index 4bcbd09..13bce58 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -56,8 +56,6 @@ QT_BEGIN_NAMESPACE -static CRITICAL_SECTION waveOutCriticalSection; - static const int minimumIntervalTime = 50; QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat): @@ -107,16 +105,16 @@ void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, case WOM_CLOSE: return; case WOM_DONE: - EnterCriticalSection(&waveOutCriticalSection); + EnterCriticalSection(&qAudio->waveOutCriticalSection); if(qAudio->finished || qAudio->buffer_size == 0 || qAudio->period_size == 0) { - LeaveCriticalSection(&waveOutCriticalSection); + LeaveCriticalSection(&qAudio->waveOutCriticalSection); return; } qAudio->waveFreeBlockCount++; if(qAudio->waveFreeBlockCount >= qAudio->buffer_size/qAudio->period_size) qAudio->waveFreeBlockCount = qAudio->buffer_size/qAudio->period_size; qAudio->feedback(); - LeaveCriticalSection(&waveOutCriticalSection); + LeaveCriticalSection(&qAudio->waveOutCriticalSection); break; default: return; |