Skip to content

Q
qgroundcontrol
Commit 30e9ca4a authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Build fixes for Mac OS

parent a98944a4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/GAudioOutput.cc
View file @ 30e9ca4a
...@@ -221,7 +221,7 @@ bool GAudioOutput::say(QString text, int severity) ...@@ -221,7 +221,7 @@ bool GAudioOutput::say(QString text, int severity)
// Slashes necessary to have the right start to the sentence // Slashes necessary to have the right start to the sentence
// copying data prevents SpeakString from reading additional chars // copying data prevents SpeakString from reading additional chars
text = "\\" + text; text = "\\" + text;
QStdWString str = text.toStdWString(); std::wstring str = text.toStdWString();
unsigned char str2[1024] = {}; unsigned char str2[1024] = {};
memcpy(str2, text.toLatin1().data(), str.length()); memcpy(str2, text.toLatin1().data(), str.length());
SpeakString(str2); SpeakString(str2);
......
src/GAudioOutput.h
View file @ 30e9ca4a
...@@ -36,8 +36,8 @@ This file is part of the PIXHAWK project ...@@ -36,8 +36,8 @@ This file is part of the PIXHAWK project
#include <QTimer> #include <QTimer>
#include <QStringList> #include <QStringList>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include <MediaObject> //#include <MediaObject>
#include <AudioOutput> //#include <AudioOutput>
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
//#include <phonon/MediaObject> //#include <phonon/MediaObject>
......
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