Remove unused code

jhonconal · Mar 2, 2016 · deb7f92 · deb7f92
1 parent 859f08c
commit deb7f92
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 53 deletions.
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
@@ -92,10 +92,6 @@ QT += \
  bluetooth \
 }
 
-contains(DEFINES, QGC_NOTIFY_TUNES_ENABLED) {
- QT += multimedia
-}
-
 # testlib is needed even in release flavor for QSignalSpy support
 QT += testlib
 

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
@@ -88,12 +88,11 @@ bool GAudioOutput::isMuted()
  return muted;
 }
 
-bool GAudioOutput::say(const QString& inText, int severity)
+bool GAudioOutput::say(const QString& inText)
 {
- if (!muted) {
+ if (!muted && !qgcApp()->runningUnitTests()) {
 #if defined __android__
 #if defined QGC_SPEECH_ENABLED
- Q_UNUSED(severity);
  static const char V_jniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"};
  QAndroidJniEnvironment env;
  if (env->ExceptionCheck()) {
@@ -105,7 +104,7 @@ bool GAudioOutput::say(const QString& inText, int severity)
  QAndroidJniObject::callStaticMethod<void>(V_jniClassName, "say", "(Ljava/lang/String;)V", javaMessage.object<jstring>());
 #endif
 #else
- emit textToSpeak(inText, severity);
+ emit textToSpeak(inText);
 #endif
  }
  return true;

diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h
@@ -79,14 +79,14 @@ class GAudioOutput : public QGCTool
  bool isMuted();
 
 public slots:
- /** @brief Say this text if current output priority matches */
- bool say(const QString& text, int severity = 6);
+ /** @brief Say this text */
+ bool say(const QString& text);
  /** @brief Mute/unmute sound */
  void mute(bool mute);
 
 signals:
  void mutedChanged(bool);
- bool textToSpeak(QString text, int severity = 1);
+ bool textToSpeak(QString text);
  void beepOnce();
 
 protected:

diff --git a/src/audio/QGCAudioWorker.cpp b/src/audio/QGCAudioWorker.cpp
@@ -76,9 +76,6 @@ QGCAudioWorker::QGCAudioWorker(QObject *parent) :
  #if defined _MSC_VER && defined QGC_SPEECH_ENABLED
  pVoice(NULL),
  #endif
- #ifdef QGC_NOTIFY_TUNES_ENABLED
- sound(NULL),
- #endif
  emergency(false),
  muted(false)
 {
@@ -89,10 +86,6 @@ QGCAudioWorker::QGCAudioWorker(QObject *parent) :
 
 void QGCAudioWorker::init()
 {
-#ifdef QGC_NOTIFY_TUNES_ENABLED
- sound = new QSound(":/res/Alert");
-#endif
-
 #if defined Q_OS_LINUX && !defined __android__ && defined QGC_SPEECH_ENABLED
  espeak_Initialize(AUDIO_OUTPUT_SYNCH_PLAYBACK, 500, NULL, 0); // initialize for playback with 500ms buffer and no options (see speak_lib.h)
  espeak_VOICE *espeak_voice = espeak_GetCurrentVoice();
@@ -135,11 +128,10 @@ QGCAudioWorker::~QGCAudioWorker()
 #endif
 }
 
-void QGCAudioWorker::say(QString inText, int severity)
+void QGCAudioWorker::say(QString inText)
 {
 #ifdef __android__
  Q_UNUSED(inText);
- Q_UNUSED(severity);
 #else
  static bool threadInit = false;
  if (!threadInit) {
@@ -150,17 +142,6 @@ void QGCAudioWorker::say(QString inText, int severity)
  if (!muted)
  {
  QString text = fixTextMessageForAudio(inText);
- // Prepend high priority text with alert beep
- if (severity < GAudioOutput::AUDIO_SEVERITY_CRITICAL) {
- beep();
- }
-
-#ifdef QGC_NOTIFY_TUNES_ENABLED
- // Wait for the last sound to finish
- while (!sound->isFinished()) {
- QGC::SLEEP::msleep(100);
- }
-#endif
 
 #if defined _MSC_VER && defined QGC_SPEECH_ENABLED
  HRESULT hr = pVoice->Speak(text.toStdWString().c_str(), SPF_DEFAULT, NULL);
@@ -195,17 +176,6 @@ void QGCAudioWorker::mute(bool mute)
  }
 }
 
-void QGCAudioWorker::beep()
-{
-
- if (!muted)
- {
-#ifdef QGC_NOTIFY_TUNES_ENABLED
- sound->play(":/res/Alert");
-#endif
- }
-}
-
 bool QGCAudioWorker::isMuted()
 {
  return this->muted;

diff --git a/src/audio/QGCAudioWorker.h b/src/audio/QGCAudioWorker.h
@@ -3,9 +3,6 @@
 
 #include <QObject>
 #include <QTimer>
-#ifdef QGC_NOTIFY_TUNES_ENABLED
-#include <QSound>
-#endif
 
 #if defined _MSC_VER && defined QGC_SPEECH_ENABLED
 // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
@@ -29,19 +26,13 @@ class QGCAudioWorker : public QObject
 signals:
 
 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();
+ /** @brief Say this text */
+ void say(QString text);
 
 protected:
  int voiceIndex; ///< The index of the flite voice to use (awb, slt, rms)
 #if defined _MSC_VER && defined QGC_SPEECH_ENABLED
  ISpVoice *pVoice;
-#endif
-#ifdef QGC_NOTIFY_TUNES_ENABLED
- QSound *sound;
 #endif
  bool emergency; ///< Emergency status flag
  QTimer *emergencyTimer;