Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
54201d52
Commit
54201d52
authored
Jun 26, 2014
by
Bryant Mairs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Phonon has been deprecated for a while. Disabled until ported to QtMultimedia.
parent
d3f50c66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
qgroundcontrol.pro
qgroundcontrol.pro
+0
-1
GAudioOutput.cc
src/GAudioOutput.cc
+3
-3
GAudioOutput.h
src/GAudioOutput.h
+6
-6
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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