From 54201d5295bb22b5cac37eda9ca02e9e396ef32c Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@gmail.com>
Date: Thu, 26 Jun 2014 21:31:33 -0700
Subject: [PATCH] Phonon has been deprecated for a while. Disabled until ported
 to QtMultimedia.

---
 qgroundcontrol.pro  |  1 -
 src/GAudioOutput.cc |  6 +++---
 src/GAudioOutput.h  | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index a3b19fb4b..c4cbb4122 100644
--- 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
index 9d479bc59..f9e36d93e 100644
--- 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
index 422d84bcb..ca8c2247d 100644
--- 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 @@ protected:
     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;
-- 
2.22.0