Merge branch 'master' into develop

This commit is contained in:
Bill Somerville 2020-09-27 19:13:28 +01:00
commit a485976058
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F

View File

@ -25,14 +25,16 @@ bool SoundInput::checkStream ()
Q_EMIT error (tr ("An error occurred during read from the audio input device."));
break;
case QAudio::UnderrunError:
Q_EMIT error (tr ("Audio data not being fed to the audio input device fast enough."));
break;
// case QAudio::UnderrunError:
// Q_EMIT error (tr ("Audio data not being fed to the audio input device fast enough."));
// break;
case QAudio::FatalError:
Q_EMIT error (tr ("Non-recoverable error, audio input device not usable at this time."));
break;
case QAudio::UnderrunError: // TODO G4WJS: stop ignoring this
// when we find the cause on macOS
case QAudio::NoError:
result = true;
break;