speech-*: refactored and unified

These two features were largely an internal fork,
let's refactor them into a single tunable one.

conf.d/homeros.mk

@@ -1,6 +1,6 @@
-
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros use/speech-en; @:
+distro/homeros-mini: distro/.live-base use/live/textinstall \
+	use/homeros use/speech/en use/isohybrid; @:
 
 endif

features.in/speech-en/README

@@ -1,2 +0,0 @@
-Эта фича полностью подготавливает англоязычный вывод речи на базе
-сервера VoiceMan.

features.in/speech-en/config.mk

@@ -1,5 +0,0 @@
-use/speech-en:
-	@$(call add_feature)
-	@$(call add,THE_LISTS,speech/voiceman)
-	@$(call add,THE_LISTS,speech/en)
-	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)

features.in/speech-en/live/image-scripts.d/10-rhvoice

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-/bin/ln -s /etc/tts.d/espeak.voiceman /etc/voiceman.d/espeak.output

features.in/speech-ru/README

@@ -1,2 +0,0 @@
-Эта фича полностью подготавливает русскоязычный вывод речи на базе
-сервера VoiceMan.

features.in/speech-ru/config.mk

@@ -1,5 +0,0 @@
-use/speech-ru:
-	@$(call add_feature)
-	@$(call add,THE_LISTS,speech/voiceman)
-	@$(call add,THE_LISTS,speech/ru)
-	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)

features.in/speech-ru/live/image-scripts.d/10-amixer

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cat <<EOF > /etc/rc.d/rc.local
-#!/bin/sh
-
-amixer set Master 75%
-amixer set Master toggle
-amixer set PCM 75%
-amixer set PCM toggle
-
-EOF
-
-chmod 755 /etc/rc.d/rc.local

features.in/speech-ru/live/image-scripts.d/10-rhvoice

@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
-/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output

features.in/speech/README

@@ -0,0 +1,2 @@
+Эта фича полностью подготавливает русскоязычный или англоязычный
+вывод речи на базе сервера VoiceMan.

features.in/speech/config.mk

@@ -0,0 +1,8 @@
+use/speech:
+	@$(call add_feature)
+	@$(call add,THE_LISTS,speech/voiceman speech/$$(SPEECH_LANG))
+	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)
+	@$(call xport,SPEECH_LANG)
+
+use/speech/en use/speech/ru:  use/speech/%: use/speech
+	@$(call set,SPEECH_LANG,$*)

features.in/speech/live/image-scripts.d/10-voiceman

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+case "$GLOBAL_SPEECH_LANG" in
+en)
+	ln -s ../tts.d/espeak.voiceman /etc/voiceman.d/espeak.output
+	;;
+ru)
+	ln -s ../tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
+	ln -s ../tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output
+	;;
+*)
+	echo "** error: speech feature used with no language chosen" >&2
+	exit 1
+	;;
+esac

pkg.in/lists/speech/ru

@@ -1,3 +1,2 @@
 RHVoice
 textlus-rhvoice
-