Commit 54201d52 authored by Bryant Mairs's avatar Bryant Mairs

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

parent d3f50c66
...@@ -84,7 +84,6 @@ QT += network \ ...@@ -84,7 +84,6 @@ QT += network \
opengl \ opengl \
svg \ svg \
xml \ xml \
phonon \
webkit \ webkit \
serialport \ serialport \
sql \ sql \
......
...@@ -129,9 +129,9 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent), ...@@ -129,9 +129,9 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
#endif #endif
// Initialize audio output // Initialize audio output
m_media = new Phonon::MediaObject(this); //m_media = new Phonon::MediaObject(this);
Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); //Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
createPath(m_media, audioOutput); //createPath(m_media, audioOutput);
// Prepare regular emergency signal, will be fired off on calling startEmergency() // Prepare regular emergency signal, will be fired off on calling startEmergency()
emergencyTimer = new QTimer(); emergencyTimer = new QTimer();
......
...@@ -40,12 +40,12 @@ This file is part of the PIXHAWK project ...@@ -40,12 +40,12 @@ This file is part of the PIXHAWK project
#include <AudioOutput> #include <AudioOutput>
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
#include <phonon/MediaObject> //#include <phonon/MediaObject>
#include <phonon/AudioOutput> //#include <phonon/AudioOutput>
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Phonon/MediaObject> //#include <Phonon/MediaObject>
#include <Phonon/AudioOutput> //#include <Phonon/AudioOutput>
#endif #endif
/* For Snow leopard and later /* For Snow leopard and later
...@@ -118,8 +118,8 @@ protected: ...@@ -118,8 +118,8 @@ protected:
static ISpVoice *pVoice; static ISpVoice *pVoice;
#endif #endif
int voiceIndex; ///< The index of the flite voice to use (awb, slt, rms) int voiceIndex; ///< The index of the flite voice to use (awb, slt, rms)
Phonon::MediaObject *m_media; ///< The output object for audio //Phonon::MediaObject *m_media; ///< The output object for audio
Phonon::AudioOutput *m_audioOutput; //Phonon::AudioOutput *m_audioOutput;
bool emergency; ///< Emergency status flag bool emergency; ///< Emergency status flag
QTimer *emergencyTimer; QTimer *emergencyTimer;
bool muted; bool muted;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment