Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
bec6c3aa
Commit
bec6c3aa
authored
Apr 11, 2010
by
pixhawk
Browse files
Fixed audio alarm
parent
66b03f3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
audio/opengroundcontrol
deleted
100755 → 0
View file @
66b03f3a
File deleted
src/GAudioOutput.cc
View file @
bec6c3aa
...
...
@@ -193,7 +193,9 @@ bool GAudioOutput::startEmergency()
if
(
!
emergency
)
{
emergency
=
true
;
emergencyTimer
->
start
(
1600
);
// Beep immediately and then start timer
beep
();
emergencyTimer
->
start
(
1500
);
}
return
true
;
}
...
...
@@ -216,7 +218,9 @@ bool GAudioOutput::stopEmergency()
void
GAudioOutput
::
beep
()
{
m_media
->
setCurrentSource
(
Phonon
::
MediaSource
(
QString
(
"alert.wav"
).
toStdString
().
c_str
()));
// Use QFile to transform path for all OS
QFile
f
(
MG
::
DIR
::
getSupportFilesDirectory
()
+
QString
(
"/audio/alert.wav"
));
m_media
->
setCurrentSource
(
Phonon
::
MediaSource
(
f
.
fileName
().
toStdString
().
c_str
()));
m_media
->
play
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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