start integrating speech guidance (draft)

3 files changed, 42 insertions, 8 deletions

diff --git a/src/build.sh b/src/build.sh
index f895129..f764ab5 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -38,7 +38,8 @@ gateway="OFF" #no vehicle gateway -> -g option
 theme_option="OFF" #no HMI theme -> -t option
 pack_for_gdp=0 #no tar generated
 html="OFF" #no html interface (draft)
-
+speech=0 #no build of speech -> -s option
+speech_option="OFF"
 
 function check_path_for_capi
 {
@@ -66,7 +67,7 @@ function check_path_for_capi
 	commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR""
 }
 
-while getopts cdghlmnptw opt
+while getopts cdghlmnpstw opt
 do
 	case $opt in
 	c)
@@ -92,6 +93,10 @@ do
 	p)
 		pack_for_gdp=1
 		;;
+	s)
+		speech=1
+		speech_option="ON"
+		;;
 	t)
 		theme_option="ON"
 		;;
@@ -100,7 +105,7 @@ do
 		;;
 	h)
 		echo "Usage:"
-		echo "$0 [-cdghlmnptw]"
+		echo "$0 [-cdghlmnpstw]"
 		echo "-c: Rebuild with clean"
 		echo "-d: Enable the debug messages"
 		echo "-g: Build the vehicle gateway"
@@ -109,6 +114,7 @@ do
 		echo "-m: Build with commonAPI plugins (only with -c)"
 		echo "-n: Build navit"
 		echo "-p: Pack the hmi (for GDP)"
+		echo "-s: Build with speech"
 		echo "-t: Generate the HMI theme (only with -c)"
 		echo "-w: Enable migration to the html based hmi"
 		exit 1
@@ -159,13 +165,27 @@ else
 		make
 	fi
 fi
-cd ../../
+
+if [ "$speech" = 1 ]
+then
+	cd ../../
+	mkdir -p speech-service
+	cd speech-service
+	echo 'build speech'
+	if [ "$clean" = 1 ]
+	then
+		cmake -DWITH_DLT=$dlt_option -DWITH_DEBUG=$debug ../../navigation/src/speech-service
+	fi
+	make
+fi
+
+cd ../
 
 echo 'build fsa'
 
 if [ "$clean" = 1 ]
 then
-	cmake -DWITH_DLT=$dlt_option $commonapi_tools_option -DWITH_DEBUG=$debug -DWITH_STYLESHEET=$theme_option -DWITH_VEHICLE_GATEWAY=$gateway -DWITH_HTML_MIGRATION=$html  ../
+	cmake -DWITH_DLT=$dlt_option $commonapi_tools_option -DWITH_DEBUG=$debug -DWITH_SPEECH=$speech_option -DWITH_STYLESHEET=$theme_option -DWITH_VEHICLE_GATEWAY=$gateway -DWITH_HTML_MIGRATION=$html  ../
 	echo 'Allow to display Korean and Japanese by replacing a font in the configuration file of navit instances'
 	sed -i -e 's/Liberation Sans/NanumGothic/' ./navigation/navit/navit/navit_genivi_mapviewer.xml
 	sed -i -e 's/Liberation Sans/NanumGothic/' ./navigation/navit/navit/navit_genivi_navigationcore.xml
diff --git a/src/run b/src/run
index 64498bc..2f352dc 100755
--- a/src/run
+++ b/src/run
@@ -109,6 +109,7 @@ verbose=0 #no debug or log messages displayed
 center="4612 N 0608 E" #geneva
 config_file=fsa_switzerland.conf #switzerland settings
 persistent=0 #reuse of persistent data disabled
+speech=0
 
 CUR_DIR=$PWD
 BIN_DIR=$CUR_DIR/build
@@ -165,8 +166,11 @@ VEHICLE_GATEWAY_SRC_DIR=$SRC_DIR/$VEHICLE_GATEWAY
 VEHICLE_GATEWAY_BIN_DIR=$BIN_DIR/$VEHICLE_GATEWAY
 devices="/dev/ttyUSB0 /dev/ttyACM0"
 
+SPEECH_SERVER=speech-server
+SPEECH_OUTPUT_BIN_DIR=$SRC_DIR/$NAVIGATION/src/speech-service/bin/
+
 # options analysis
-while getopts a:c:df:g:hlnoprvx opt
+while getopts a:c:df:g:hlnoprsvx opt
 do
 	case $opt in
 	a) #select another hmi panel
@@ -224,6 +228,9 @@ do
 	r) #disable the log replayer
 		replayer=0
 		;;
+	s)
+		speech=1
+		;;
 	v) #enable log messages
 		verbose=1
 		;;
@@ -232,7 +239,7 @@ do
 		;;
 	h)
 		echo "Usage:"
-		echo "$0 [-a application][-c center][-ghlnoprvx]"
+		echo "$0 [-a application][-c center][-ghlnoprsvx]"
 		echo "-a: Set application (default application.qml)"
 		echo "-c: Set center (supported values: paris,tokyo,london,seoul,longitude latitude). Default is geneve"
 		echo "-d: Run subprocesses within gdb (only with -x)"
@@ -244,6 +251,7 @@ do
 		echo "-o: Create log file of subprocess output"
 		echo "-p: Reuse of persistent data (i.e. in $HOME, so don't reinit it with default file)"
 		echo "-r: Don't start replayer"
+		echo "-s: Launch the speech server"
 		echo "-v: Enable the output of log or debug messages"
 		echo "-x: Run subprocesses in own xterm to get separated log messages (doesn't make sense with -l)"
 		exit 1
@@ -345,6 +353,12 @@ else
 	fi
 fi
 
+if [ "$speech" = 1 ]
+then
+	# start the speech server 
+	run "Speech service" $SPEECH_OUTPUT_BIN_DIR/$SPEECH_SERVER 
+fi
+
 sleep 3 # need a sleep here (to be improved)
 # start the fuel stop advisor application
 run "Fuel Stop Advisor" $FUEL_STOP_ADVISOR_BIN_DIR/$FUEL_STOP_ADVISOR
diff --git a/src/update_third_party.sh b/src/update_third_party.sh
index 545446d..9e84053 100755
--- a/src/update_third_party.sh
+++ b/src/update_third_party.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-navigation_version='f14e57e3656a5500563bdd32537ac1295d4a3f52'
+navigation_version='b9bda20d81ea44ed8265de8819eb95e2e31dabf9'
 positioning_version='9725fe1f553197042d6445997690d452a73490c0'
 navit_version='f5abdd317e10d56226300d001469595658a605e4'