slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Change-Id: I01940fe4f3d059fbb425492a1748e2b5d9b6804b
This commit is contained in:
Liang Qi
2016-01-19 09:50:11 +01:00
parent c9a841a376 8d84a30e4d
commit 02b8c7527a
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/multimedia/audio/qsoundeffect_qaudio_p.cpp
View File

@@ -353,7 +353,8 @@ void PrivateSoundSource::stateChanged(QAudio::State state)
#ifdef QT_QAUDIO_DEBUG
qDebug() << this << "stateChanged " << state;
#endif
if (state == QAudio::IdleState && m_runningCount == 0)
if ((state == QAudio::IdleState && m_runningCount == 0)
|| (state == QAudio::StoppedState && m_audioOutput->error() != QAudio::NoError))
emit soundeffect->stop();
}

2
src/plugins/windowsaudio/qwindowsaudioinput.cpp
View File

@@ -90,7 +90,7 @@ void QT_WIN_CALLBACK QWindowsAudioInput::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
if(!qAudio)
return;
QMutexLocker(&qAudio->mutex);
QMutexLocker locker(&qAudio->mutex);
switch(uMsg) {
case WIM_OPEN:

2
src/plugins/windowsaudio/qwindowsaudiooutput.cpp
View File

@@ -90,7 +90,7 @@ void CALLBACK QWindowsAudioOutput::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
if(!qAudio)
return;
QMutexLocker(&qAudio->mutex);
QMutexLocker locker(&qAudio->mutex);
switch(uMsg) {
case WOM_OPEN: