Phonon has been deprecated for a while. Disabled until ported to QtMu…

…ltimedia.
jhonconal · Jun 27, 2014 · 54201d5 · 54201d5
1 parent d3f50c6
commit 54201d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
@@ -84,7 +84,6 @@ QT += network \
  opengl \
  svg \
  xml \
- phonon \
  webkit \
  serialport \
  sql \

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
@@ -129,9 +129,9 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
 
 #endif
  // Initialize audio output
- m_media = new Phonon::MediaObject(this);
- Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
- createPath(m_media, audioOutput);
+ //m_media = new Phonon::MediaObject(this);
+ //Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+ //createPath(m_media, audioOutput);
 
  // Prepare regular emergency signal, will be fired off on calling startEmergency()
  emergencyTimer = new QTimer();

diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h
@@ -40,12 +40,12 @@ This file is part of the PIXHAWK project
 #include <AudioOutput>
 #endif
 #ifdef Q_OS_LINUX
-#include <phonon/MediaObject>
-#include <phonon/AudioOutput>
+//#include <phonon/MediaObject>
+//#include <phonon/AudioOutput>
 #endif
 #ifdef Q_OS_WIN
-#include <Phonon/MediaObject>
-#include <Phonon/AudioOutput>
+//#include <Phonon/MediaObject>
+//#include <Phonon/AudioOutput>
 #endif
 
 /* For Snow leopard and later
@@ -118,8 +118,8 @@ public slots:
  static ISpVoice *pVoice;
 #endif
  int voiceIndex; ///< The index of the flite voice to use (awb, slt, rms)
- Phonon::MediaObject *m_media; ///< The output object for audio
- Phonon::AudioOutput *m_audioOutput;
+ //Phonon::MediaObject *m_media; ///< The output object for audio
+ //Phonon::AudioOutput *m_audioOutput;
  bool emergency; ///< Emergency status flag
  QTimer *emergencyTimer;
  bool muted;