From c572ce8b6650feaa95d2bf5aaaaa42ff53588097 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 27 Sep 2020 14:06:22 +0100 Subject: [PATCH 1/3] Avoid showing a message box recursively --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index a3cb166a4..7d5d6103a 100644 --- a/main.cpp +++ b/main.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) // Multiple instances communicate with jt9 via this QSharedMemory mem_jt9; - ExceptionCatchingApplication a(argc, argv); + QApplication a(argc, argv); try { // qDebug () << "+++++++++++++++++++++++++++ Resources ++++++++++++++++++++++++++++"; From 344000d9943ac502966450b96b082ed59a77d659 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 27 Sep 2020 14:06:22 +0100 Subject: [PATCH 2/3] Avoid showing a message box recursively --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index a3cb166a4..7d5d6103a 100644 --- a/main.cpp +++ b/main.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) // Multiple instances communicate with jt9 via this QSharedMemory mem_jt9; - ExceptionCatchingApplication a(argc, argv); + QApplication a(argc, argv); try { // qDebug () << "+++++++++++++++++++++++++++ Resources ++++++++++++++++++++++++++++"; From 7b000afb78125c23682bbd8fd97bc64634f7274d Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 27 Sep 2020 17:25:58 +0100 Subject: [PATCH 3/3] Ignore audio i/p underrun error until macOS behaviour understood --- Audio/soundin.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Audio/soundin.cpp b/Audio/soundin.cpp index 92368016b..53779b341 100644 --- a/Audio/soundin.cpp +++ b/Audio/soundin.cpp @@ -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;