Browse Source

Build fixes for Mac OS

QGC4.4
Lorenz Meier 11 years ago
parent
commit
30e9ca4a83
  1. 2
      src/GAudioOutput.cc
  2. 4
      src/GAudioOutput.h

2
src/GAudioOutput.cc

@ -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
// copying data prevents SpeakString from reading additional chars
text = "\\" + text;
QStdWString str = text.toStdWString();
std::wstring str = text.toStdWString();
unsigned char str2[1024] = {};
memcpy(str2, text.toLatin1().data(), str.length());
SpeakString(str2);

4
src/GAudioOutput.h

@ -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 <QStringList>
#ifdef Q_OS_MAC
#include <MediaObject>
#include <AudioOutput>
//#include <MediaObject>
//#include <AudioOutput>
#endif
#ifdef Q_OS_LINUX
//#include <phonon/MediaObject>

Loading…
Cancel
Save