From 03f3b2113aedc0e2e3cbdc6264184e480899b385 Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@student.ethz.ch>
Date: Sun, 11 Apr 2010 14:33:34 +0200
Subject: [PATCH] Fixes for audio on Linux

---
 mavground.pri       | 4 ++--
 src/GAudioOutput.cc | 9 +++++----
 src/lib/qwt/qwt.pri | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mavground.pri b/mavground.pri
index fd432999b..be7d255da 100644
--- a/mavground.pri
+++ b/mavground.pri
@@ -63,8 +63,8 @@ macx {
 
     message(Building for Mac OS X 32/64bit)
 
-    #CONFIG += x86
-    CONFIG += x86_64 cocoa
+    CONFIG += x86 cocoa
+    #CONFIG += x86_64 cocoa
     CONFIG -= static
 
     DESTDIR = $$BASEDIR/bin/mac
diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index 5dc61e784..a2059e8e7 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -48,7 +48,8 @@ using System.Speech.Synthesis;
 
 #ifdef Q_OS_LINUX
 extern "C" {
-#include <cmu_us_awb/voxdefs.h>
+    #include <flite.h>
+    #include <cmu_us_awb/voxdefs.h>
     //#include <cmu_us_slt/voxdefs.h>
     //cst_voice *REGISTER_VOX(const char *voxdir);
     //void UNREGISTER_VOX(cst_voice *vox);
@@ -222,14 +223,14 @@ void GAudioOutput::beep()
 void GAudioOutput::selectFemaleVoice()
 {
 #ifdef Q_OS_LINUX
-    this->voice = register_cmu_us_slt(NULL);
+    //this->voice = register_cmu_us_slt(NULL);
 #endif
 }
 
 void GAudioOutput::selectMaleVoice()
 {
 #ifdef Q_OS_LINUX
-    this->voice = register_cmu_us_rms(NULL);
+    //this->voice = register_cmu_us_rms(NULL);
 #endif
 }
 
@@ -237,7 +238,7 @@ void GAudioOutput::selectMaleVoice()
 void GAudioOutput::selectNeutralVoice()
 {
 #ifdef Q_OS_LINUX
-    this->voice = register_cmu_us_awb(NULL);
+    //this->voice = register_cmu_us_awb(NULL);
 #endif
 }
 
diff --git a/src/lib/qwt/qwt.pri b/src/lib/qwt/qwt.pri
index 84dc43278..34739fbf9 100644
--- a/src/lib/qwt/qwt.pri
+++ b/src/lib/qwt/qwt.pri
@@ -77,7 +77,7 @@ HEADERS += $$QWTSRCDIR/qwt.h \
            $$QWTSRCDIR/qwt_thermo.h \
            $$QWTSRCDIR/qwt_valuelist.h \
            $$QWTSRCDIR/qwt_wheel.h
-SOURCES += qwt_abstract_scale.cpp \
+SOURCES += $$QWTSRCDIR/qwt_abstract_scale.cpp \
            $$QWTSRCDIR/qwt_abstract_scale_draw.cpp \
            $$QWTSRCDIR/qwt_abstract_slider.cpp \
            $$QWTSRCDIR/qwt_analog_clock.cpp \
-- 
2.22.0