Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
54201d52
Commit
54201d52
authored
Jun 26, 2014
by
Bryant Mairs
Browse files
Phonon has been deprecated for a while. Disabled until ported to QtMultimedia.
parent
d3f50c66
Changes
3
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pro
View file @
54201d52
...
...
@@ -84,7 +84,6 @@ QT += network \
opengl
\
svg
\
xml
\
phonon
\
webkit
\
serialport
\
sql
\
...
...
src/GAudioOutput.cc
View file @
54201d52
...
...
@@ -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
();
...
...
src/GAudioOutput.h
View file @
54201d52
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment