Add: Add speech module using espeak on QMultimedia. (#233)R7471

* Add: Add speech module using (external) espeak on QMultimedia.

* Add: Find system espeak or use internal one

This patch adds a cmake module to find installed libespeak.
If not found, it builds against included libespeak, despite it being
heavily patched.

* Fix: allow building internal espeak for posix systems

Allow the usage of the internal (ported to C) version of espeak as
replacement for system installed libespeak.

* Fix: use synchronous espeak mode if internal espeak is used

* Fix: Clear buffer if samples are played

* Fix: use syncronous mode always, as QBuffer is not thread safe

* Sailfish: Use qt5_espeak

* Remove espeak shell script now obsolete

* Fix: remove the espeak script from the repo

* Fix: code cleanup. Fix audio buffer size

* Fix: apply coding style

Apply automatic coding style with 'clang-format -style=WebKit -i'

* Fix; restore correct include file order

Seems, our internal include files depend on correct order. This usually
is a bad thing and we should consider fixing them. But this is another
story...

* Add qtmultimedia-dev to windows build for qt5_espeak

* Rename CMake INTERNAL_ESPEAK -> INTERNAL_ESPEAK_COMPLETE

3 files changed, 5 insertions, 8 deletions

diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index c25af5fe5..9c7a79b9b 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -10,7 +10,7 @@ Name: harbour-navit
 Summary: Open Source car navigation system
 #Version: %{navit_version}_%{git_version}
 Version: 0.5.1
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 URL: http://navit-projet.org/
@@ -90,14 +90,13 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 %make_install
 #copy in sailfish config
 cp %{navit_real_source}/contrib/sailfish/navit.xml %{buildroot}/usr/share/harbour-navit/navit.xml
-#copy in espeak script
-cp %{navit_real_source}/contrib/sailfish/say_de_DE.sh %{buildroot}/usr/bin/say_de_DE.sh
 
 %files
 %defattr(644, root, root, 755)
 %{_datadir}/harbour-navit/navit.xml
 %{_datadir}/harbour-navit/xpm/
 %{_datadir}/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin
+%{_datadir}/harbour-navit/espeak-data/
 %{_datadir}/applications/harbour-navit.desktop
 %{_datadir}/icons/hicolor/256x256/apps/harbour-navit.png
 %{_datadir}/icons/hicolor/128x128/apps/harbour-navit.png
@@ -106,12 +105,12 @@ cp %{navit_real_source}/contrib/sailfish/say_de_DE.sh %{buildroot}/usr/bin/say_d
 %{_datadir}/icons/hicolor/22x22/apps/harbour-navit.png
 %{_datadir}/harbour-navit/locale/
 %attr(755, root, root) %{_bindir}/harbour-navit
-%attr(755, root, root) %{_bindir}/say_de_DE.sh
 %doc %{_mandir}/man1/harbour-navit.1.gz
 %doc %{_mandir}/man1/maptool.1.gz
 
 
 %changelog
-*Mon Dec 14 2015 Initial sailfish release
+*Wed May 03 2017 Use qt5_espeak
 *Mon Apr 10 2017 Almost harbour valid
+*Mon Dec 14 2015 Initial sailfish release
 - Initial package.
diff --git a/contrib/sailfish/navit.xml b/contrib/sailfish/navit.xml
index faa5b23a1..4f2c96941 100755
--- a/contrib/sailfish/navit.xml
+++ b/contrib/sailfish/navit.xml
@@ -384,7 +384,7 @@ Waypoint</text></img>
 			If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
 			The default is text output to the shell -->
 		<!-- speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/ -->
-		<speech type="cmdline" data="say_de_DE.sh '%s'" cps="15"/>
+		<speech type="qt5_espeak" cps="15"/>
 		<!--
 		Instead of using a speech synthesizer, navit can also play pre-recorded samples for each word.
 		See http://wiki.navit-project.org/index.php/Configuration for details.
diff --git a/contrib/sailfish/say_de_DE.sh b/contrib/sailfish/say_de_DE.sh
deleted file mode 100755
index bba4aa4fc..000000000
--- a/contrib/sailfish/say_de_DE.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-espeak -s150 -a 200 -vde "$1" --stdout | paplay