Browse Source

Force TTS to English (on Linux only)

Remove unnecessary AudioOutput dependencies.
QGC4.4
Gus Grubba 6 years ago
parent
commit
a9ff4d8dc7
  1. 12
      src/Audio/AudioOutput.cc
  2. 1
      src/Audio/AudioOutput.h
  3. 1
      src/QGCApplication.cc
  4. 1
      src/Vehicle/Vehicle.cc
  5. 1
      src/uas/UAS.cc

12
src/Audio/AudioOutput.cc

@ -20,14 +20,12 @@ AudioOutput::AudioOutput(QGCApplication* app, QGCToolbox* toolbox) @@ -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)

1
src/Audio/AudioOutput.h

@ -33,7 +33,6 @@ public slots: @@ -33,7 +33,6 @@ public slots:
private slots:
void _stateChanged (QTextToSpeech::State state);
void _languageChanged (const QLocale locale);
protected:
QTextToSpeech* _tts;

1
src/QGCApplication.cc

@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
#include "QGC.h"
#include "QGCApplication.h"
#include "AudioOutput.h"
#include "CmdLineOptParser.h"
#include "UDPLink.h"
#include "LinkManager.h"

1
src/Vehicle/Vehicle.cc

@ -28,7 +28,6 @@ @@ -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"

1
src/uas/UAS.cc

@ -26,7 +26,6 @@ @@ -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"

Loading…
Cancel
Save