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
8f6561af
Commit
8f6561af
authored
Apr 13, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of pixhawk.ethz.ch:groundcontrol
parents
49c71137
9e707210
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
qgroundcontrol.pri
qgroundcontrol.pri
+2
-1
GAudioOutput.cc
src/GAudioOutput.cc
+5
-3
No files found.
qgroundcontrol.pri
View file @
8f6561af
...
@@ -132,7 +132,8 @@ win32 {
...
@@ -132,7 +132,8 @@ win32 {
LIBS += -L$$BASEDIR\lib\sdl\win32 \
LIBS += -L$$BASEDIR\lib\sdl\win32 \
-lmingw32 -lSDLmain -lSDL -mwindows
-lmingw32 -lSDLmain -lSDL -mwindows
INCLUDEPATH += $$BASEDIR/lib/sdl/include
INCLUDEPATH += $$BASEDIR/lib/sdl/include \
"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
debug {
debug {
DESTDIR = $$BASEDIR/bin
DESTDIR = $$BASEDIR/bin
...
...
src/GAudioOutput.cc
View file @
8f6561af
...
@@ -40,8 +40,9 @@ This file is part of the PIXHAWK project
...
@@ -40,8 +40,9 @@ This file is part of the PIXHAWK project
#include <ApplicationServices/ApplicationServices.h>
#include <ApplicationServices/ApplicationServices.h>
#endif
#endif
#ifdef Q_OS_WINDOWS
// Speech synthesis is only supported with MSVC compiler
#include <windows.h>
#if _MSC_VER
#include <sapi.h>
using
System
;
using
System
;
using
System
.
Speech
.
Synthesis
;
using
System
.
Speech
.
Synthesis
;
#endif
#endif
...
@@ -117,7 +118,8 @@ bool GAudioOutput::say(QString text, int severity)
...
@@ -117,7 +118,8 @@ bool GAudioOutput::say(QString text, int severity)
if
(
!
emergency
)
if
(
!
emergency
)
{
{
#ifdef Q_OS_WINDOWS
// Speech synthesis is only supported with MSVC compiler
#if _MSC_VER
SpeechSynthesizer
synth
=
new
SpeechSynthesizer
();
SpeechSynthesizer
synth
=
new
SpeechSynthesizer
();
synth
.
SelectVoice
(
"Microsoft Anna"
);
synth
.
SelectVoice
(
"Microsoft Anna"
);
synth
.
SpeakText
(
"Hello, world!"
);
synth
.
SpeakText
(
"Hello, world!"
);
...
...
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