From eb3f48b99c6a34421ab72067e065b45d606b8367 Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Tue, 18 Feb 2014 00:20:04 +0100
Subject: [PATCH] fix merge errors and unused-variable error

---
 src/GAudioOutput.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index dff99deaa..0d21d1c40 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -110,8 +110,10 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
     espeak_voice.variant = 0;
     espeak_voice.gender = 2;
     espeak_SetVoiceByProperties(&espeak_voice);
-    espeak_PARAMETER rateParam = espeakRATE;
+    // Rate of eSpeak can be changed if needed:
+//    espeak_PARAMETER rateParam = espeakRATE;
 //  espeak_SetParameter(rateParam , 150, 0);
+#endif
 
 #if defined _MSC_VER && defined QGC_SPEECH_ENABLED
     pVoice = NULL;
-- 
2.22.0