diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index a3b19fb4bfbd3757e333fcd7aa19817d57a8144b..c4cbb41220141d9de25e3904545c37a0c49a1006 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 9d479bc590b1f1928253b632c433c57d12ad0cef..f9e36d93e7c656f426ddb9a863aadb24d2547ca4 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 422d84bcb2acb6637c77c3c453fa7fcb137aa5af..ca8c2247dabd857e8a1a2c9dd3619e560aadc6cd 100644 --- a/src/GAudioOutput.h +++ b/src/GAudioOutput.h @@ -40,12 +40,12 @@ This file is part of the PIXHAWK project #include #endif #ifdef Q_OS_LINUX -#include -#include +//#include +//#include #endif #ifdef Q_OS_WIN -#include -#include +//#include +//#include #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;