From 4bb161b88db056e3c941856d1628a94e4ad99b48 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 9 Dec 2014 00:55:16 +0100
Subject: [PATCH] Fix beep API and unconnected slot

---
 src/GAudioOutput.cc          | 12 ++----------
 src/GAudioOutput.h           |  1 +
 src/audio/QGCAudioWorker.cpp | 15 +++++++++++++++
 src/audio/QGCAudioWorker.h   |  3 +++
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index 891d8c7ad..c296aa3ce 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -65,6 +65,7 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
 {
     worker->moveToThread(thread);
     connect(this, SIGNAL(textToSpeak(QString,int)), worker, SLOT(say(QString,int)));
+    connect(this, SIGNAL(beepOnce()), worker, SLOT(beep()));
     thread->start();
 }
 
@@ -146,7 +147,6 @@ bool GAudioOutput::startEmergency()
 //        emergency = true;
 
 //        // Beep immediately and then start timer
-//        if (!muted) beep();
 
 //        emergencyTimer->start(1500);
 //        QTimer::singleShot(5000, this, SLOT(stopEmergency()));
@@ -174,13 +174,5 @@ bool GAudioOutput::stopEmergency()
 
 void GAudioOutput::beep()
 {
-    if (!muted)
-    {
-        // FIXME: Re-enable audio beeps
-        // Use QFile to transform path for all OS
-        //QFile f(QCoreApplication::applicationDirPath() + QString("/files/audio/alert.wav"));
-        //qDebug() << "FILE:" << f.fileName();
-        //m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
-        //m_media->play();
-    }
+    emit beepOnce();
 }
diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h
index ce21c904f..4330a8e81 100644
--- a/src/GAudioOutput.h
+++ b/src/GAudioOutput.h
@@ -86,6 +86,7 @@ public slots:
 signals:
     void mutedChanged(bool);
     bool textToSpeak(QString text, int severity = 1);
+    void beepOnce();
 
 protected:
     bool muted;
diff --git a/src/audio/QGCAudioWorker.cpp b/src/audio/QGCAudioWorker.cpp
index ac5b036dd..92ff74ae5 100644
--- a/src/audio/QGCAudioWorker.cpp
+++ b/src/audio/QGCAudioWorker.cpp
@@ -136,6 +136,21 @@ void QGCAudioWorker::mute(bool mute)
     }
 }
 
+void QGCAudioWorker::beep()
+{
+    // XXX beep beep
+
+    if (!muted)
+    {
+        // FIXME: Re-enable audio beeps
+        // Use QFile to transform path for all OS
+        //QFile f(QCoreApplication::applicationDirPath() + QString("/files/audio/alert.wav"));
+        //qDebug() << "FILE:" << f.fileName();
+        //m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
+        //m_media->play();
+    }
+}
+
 bool QGCAudioWorker::isMuted()
 {
     return this->muted;
diff --git a/src/audio/QGCAudioWorker.h b/src/audio/QGCAudioWorker.h
index 749dd6147..38077ead9 100644
--- a/src/audio/QGCAudioWorker.h
+++ b/src/audio/QGCAudioWorker.h
@@ -32,6 +32,9 @@ public slots:
     /** @brief Say this text if current output priority matches */
     void say(QString text, int severity = 1);
 
+    /** @brief Sound a single beep */
+    void beep();
+
 protected:
 #if defined Q_OS_MAC && defined QGC_SPEECH_ENABLED
     //NSSpeechSynthesizer
-- 
2.22.0