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
74e4704f
Commit
74e4704f
authored
Nov 12, 2011
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile warnings, fixed a windows-specific compile error
parent
fed4ee04
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
13 deletions
+15
-13
GAudioOutput.cc
src/GAudioOutput.cc
+9
-9
MAVLinkSimulationLink.h
src/comm/MAVLinkSimulationLink.h
+1
-0
SerialLink.cc
src/comm/SerialLink.cc
+3
-2
HSIDisplay.cc
src/ui/HSIDisplay.cc
+1
-1
MainWindow.cc
src/ui/MainWindow.cc
+1
-1
No files found.
src/GAudioOutput.cc
View file @
74e4704f
...
...
@@ -119,9 +119,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
();
...
...
@@ -228,8 +228,8 @@ void GAudioOutput::notifyPositive()
if
(
!
muted
)
{
// Use QFile to transform path for all OS
QFile
f
(
QCoreApplication
::
applicationDirPath
()
+
QString
(
"/audio/double_notify.wav"
));
m_media
->
setCurrentSource
(
Phonon
::
MediaSource
(
f
.
fileName
().
toStdString
().
c_str
()));
m_media
->
play
();
//
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
//
m_media->play();
}
}
...
...
@@ -238,8 +238,8 @@ void GAudioOutput::notifyNegative()
if
(
!
muted
)
{
// Use QFile to transform path for all OS
QFile
f
(
QCoreApplication
::
applicationDirPath
()
+
QString
(
"/audio/flat_notify.wav"
));
m_media
->
setCurrentSource
(
Phonon
::
MediaSource
(
f
.
fileName
().
toStdString
().
c_str
()));
m_media
->
play
();
//
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
//
m_media->play();
}
}
...
...
@@ -283,8 +283,8 @@ void GAudioOutput::beep()
// Use QFile to transform path for all OS
QFile
f
(
QCoreApplication
::
applicationDirPath
()
+
QString
(
"/audio/alert.wav"
));
qDebug
()
<<
"FILE:"
<<
f
.
fileName
();
m_media
->
setCurrentSource
(
Phonon
::
MediaSource
(
f
.
fileName
().
toStdString
().
c_str
()));
m_media
->
play
();
//
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
//
m_media->play();
}
}
...
...
src/comm/MAVLinkSimulationLink.h
View file @
74e4704f
...
...
@@ -38,6 +38,7 @@ This file is part of the QGROUNDCONTROL project
#include <QQueue>
#include <QMutex>
#include <QMap>
#include <qmath.h>
#include <inttypes.h>
#include "QGCMAVLink.h"
...
...
src/comm/SerialLink.cc
View file @
74e4704f
...
...
@@ -211,8 +211,9 @@ using namespace TNX;
SerialLink
::
SerialLink
(
QString
portname
,
int
baudRate
,
bool
hardwareFlowControl
,
bool
parity
,
int
dataBits
,
int
stopBits
)
:
port
(
NULL
),
m_stopp
(
false
),
ports
(
new
QVector
<
QString
>
())
port
(
NULL
),
ports
(
new
QVector
<
QString
>
()),
m_stopp
(
false
)
{
// Setup settings
this
->
porthandle
=
portname
.
trimmed
();
...
...
src/ui/HSIDisplay.cc
View file @
74e4704f
...
...
@@ -99,8 +99,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
laserFix
(
0
),
mavInitialized
(
false
),
bottomMargin
(
10.0
f
),
topMargin
(
12.0
f
),
dragStarted
(
false
),
topMargin
(
12.0
f
),
leftDragStarted
(
false
),
mouseHasMoved
(
false
),
actionPending
(
false
),
...
...
src/ui/MainWindow.cc
View file @
74e4704f
...
...
@@ -92,8 +92,8 @@ MainWindow::MainWindow(QWidget *parent):
aboutToCloseFlag
(
false
),
changingViewsFlag
(
false
),
styleFileName
(
QCoreApplication
::
applicationDirPath
()
+
"/style-indoor.css"
),
autoReconnect
(
false
),
centerStackActionGroup
(
this
),
autoReconnect
(
false
),
lowPowerMode
(
false
)
{
hide
();
...
...
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