Skip to content

Q
qgroundcontrol
Commit bec6c3aa authored by pixhawk's avatar pixhawk
Browse files
Options

Fixed audio alarm

parent 66b03f3a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/GAudioOutput.cc
View file @ bec6c3aa
...@@ -193,7 +193,9 @@ bool GAudioOutput::startEmergency() ...@@ -193,7 +193,9 @@ bool GAudioOutput::startEmergency()
if (!emergency) if (!emergency)
{ {
emergency = true; emergency = true;
emergencyTimer->start(1600); // Beep immediately and then start timer
beep();
emergencyTimer->start(1500);
} }
return true; return true;
} }
...@@ -216,7 +218,9 @@ bool GAudioOutput::stopEmergency() ...@@ -216,7 +218,9 @@ bool GAudioOutput::stopEmergency()
void GAudioOutput::beep() 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(); m_media->play();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment