Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a9ff4d8d
Commit
a9ff4d8d
authored
Jun 13, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force TTS to English (on Linux only)
Remove unnecessary AudioOutput dependencies.
parent
a3b87e1f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
11 deletions
+5
-11
AudioOutput.cc
src/Audio/AudioOutput.cc
+5
-7
AudioOutput.h
src/Audio/AudioOutput.h
+0
-1
QGCApplication.cc
src/QGCApplication.cc
+0
-1
Vehicle.cc
src/Vehicle/Vehicle.cc
+0
-1
UAS.cc
src/uas/UAS.cc
+0
-1
No files found.
src/Audio/AudioOutput.cc
View file @
a9ff4d8d
...
...
@@ -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
)
...
...
src/Audio/AudioOutput.h
View file @
a9ff4d8d
...
...
@@ -33,7 +33,6 @@ public slots:
private
slots
:
void
_stateChanged
(
QTextToSpeech
::
State
state
);
void
_languageChanged
(
const
QLocale
locale
);
protected:
QTextToSpeech
*
_tts
;
...
...
src/QGCApplication.cc
View file @
a9ff4d8d
...
...
@@ -42,7 +42,6 @@
#include "QGC.h"
#include "QGCApplication.h"
#include "AudioOutput.h"
#include "CmdLineOptParser.h"
#include "UDPLink.h"
#include "LinkManager.h"
...
...
src/Vehicle/Vehicle.cc
View file @
a9ff4d8d
...
...
@@ -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"
...
...
src/uas/UAS.cc
View file @
a9ff4d8d
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment