From 2ffe87902dc72b4c26032c94e8250ff92d2888dc Mon Sep 17 00:00:00 2001
From: William Wilgus <wilgus.william@gmail.com>
Date: Sun, 20 Sep 2020 13:29:02 -0400
Subject: Add Invalid Voice Announcement to the voice system FS#13216

When a voice file is invalid or fails to load the voice system splash a
message 'Invalid Voice'

Now we supply a single voice file (currently only english is used)
the support for other languages is in but I haven't set it up to
look for anything but InvalidVoice_english.talk

Also adds a one time kill voice thread function
 ie. it doesn't allow re-init after killing the voice thread & queue

Change-Id: I7b43f340c3cc65c65110190f0e0075b31218a7ac
---
 apps/lang/InvalidVoice_english.talk | Bin 0 -> 2707 bytes
 apps/lang/SOURCES                   |   1 +
 apps/lang/lang.make                 |   6 +++++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 apps/lang/InvalidVoice_english.talk

(limited to 'apps/lang')

diff --git a/apps/lang/InvalidVoice_english.talk b/apps/lang/InvalidVoice_english.talk
new file mode 100644
index 0000000000..e40f227c33
Binary files /dev/null and b/apps/lang/InvalidVoice_english.talk differ
diff --git a/apps/lang/SOURCES b/apps/lang/SOURCES
index 276d1bff1c..3faa5d5add 100644
--- a/apps/lang/SOURCES
+++ b/apps/lang/SOURCES
@@ -46,3 +46,4 @@ hindi.lang
 japanese.lang
 korean.lang
 thai.lang
+InvalidVoice_english.talk
diff --git a/apps/lang/lang.make b/apps/lang/lang.make
index 807ac0f53f..73b6dce3de 100644
--- a/apps/lang/lang.make
+++ b/apps/lang/lang.make
@@ -54,6 +54,10 @@ $(BUILDDIR)/%.lng $(BUILDDIR)/%.vstrings: $(ROOTDIR)/%.lang $(BUILDDIR)/apps/gen
 	$(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/$(ENGLISH).lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp
 	$(SILENT)rm -f $@.tmp
 
-$(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ)
+$(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ) $(wildcard $(BUILDDIR)/apps/lang/*.talk)
 	$(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@))
 	$(SILENT)zip -9 -q $@ $(subst $(BUILDDIR)/,,$^)
+
+#copy any included talk files to the /lang directory
+$(BUILDDIR)/apps/lang/%.talk: $(ROOTDIR)/apps/lang/%.talk
+	$(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/lang
-- 
cgit v1.2.3