From a9ff4d8dc707e1f81e1a2e5856b117d5a89e968a Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Thu, 13 Jun 2019 07:41:47 -0400
Subject: [PATCH] Force TTS to English (on Linux only) Remove unnecessary
 AudioOutput dependencies.

---
 src/Audio/AudioOutput.cc | 12 +++++-------
 src/Audio/AudioOutput.h  |  1 -
 src/QGCApplication.cc    |  1 -
 src/Vehicle/Vehicle.cc   |  1 -
 src/uas/UAS.cc           |  1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Audio/AudioOutput.cc b/src/Audio/AudioOutput.cc
index 5f48d8f85..4c892b5da 100644
--- a/src/Audio/AudioOutput.cc
+++ b/src/Audio/AudioOutput.cc
@@ -20,14 +20,12 @@ AudioOutput::AudioOutput(QGCApplication* app, QGCToolbox* toolbox)
     : QGCTool(app, toolbox)
     , _tts(new QTextToSpeech(this))
 {
-    _tts->setLocale(QLocale::system());
+    //-- Force TTS engine to English as all incoming messages from the autopilot
+    //   are in English and not localized.
+#ifdef Q_OS_LINUX
+    _tts->setLocale(QLocale("en_US"));
+#endif
     connect(_tts, &QTextToSpeech::stateChanged, this, &AudioOutput::_stateChanged);
-    connect(qgcApp(), &QGCApplication::languageChanged, this, &AudioOutput::_languageChanged);
-}
-
-void AudioOutput::_languageChanged(const QLocale locale)
-{
-    _tts->setLocale(locale);
 }
 
 bool AudioOutput::say(const QString& inText)
diff --git a/src/Audio/AudioOutput.h b/src/Audio/AudioOutput.h
index d3e0a34db..b97d81f4e 100644
--- a/src/Audio/AudioOutput.h
+++ b/src/Audio/AudioOutput.h
@@ -33,7 +33,6 @@ public slots:
 
 private slots:
     void            _stateChanged           (QTextToSpeech::State state);
-    void            _languageChanged        (const QLocale locale);
 
 protected:
     QTextToSpeech*  _tts;
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 6367e758f..800462089 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -42,7 +42,6 @@
 
 #include "QGC.h"
 #include "QGCApplication.h"
-#include "AudioOutput.h"
 #include "CmdLineOptParser.h"
 #include "UDPLink.h"
 #include "LinkManager.h"
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index cf12aee90..8ff3632ad 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -28,7 +28,6 @@
 #include "ParameterManager.h"
 #include "QGCApplication.h"
 #include "QGCImageProvider.h"
-#include "AudioOutput.h"
 #include "FollowMe.h"
 #include "MissionCommandTree.h"
 #include "QGroundControlQmlGlobal.h"
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index cb1101612..16e80abf2 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -26,7 +26,6 @@
 #include "UAS.h"
 #include "LinkInterface.h"
 #include "QGC.h"
-#include "AudioOutput.h"
 #include "MAVLinkProtocol.h"
 #include "QGCMAVLink.h"
 #include "LinkManager.h"
-- 
2.22.0