w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat-boost-log

Browse Source
This commit is contained in:
Bill Somerville 2020-09-28 13:06:33 +01:00
commit c5f4c1557b
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Audio/soundin.cpp
View File

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

2
main.cpp
View File

@ -102,7 +102,7 @@ int main(int argc, char *argv[])
// Multiple instances communicate with jt9 via this // Multiple instances communicate with jt9 via this
QSharedMemory mem_jt9; QSharedMemory mem_jt9;
ExceptionCatchingApplication a(argc, argv); QApplication a(argc, argv);
try try
{ {
// LOG_INfO ("+++++++++++++++++++++++++++ Resources ++++++++++++++++++++++++++++"); // LOG_INfO ("+++++++++++++++++++++++++++ Resources ++++++++++++++++++++++++++++");