Upgrade to Flite 2.0.0 and add Indic support

happyalu · Feb 4, 2015 · 9b3b29a · 9b3b29a
1 parent 9731487
commit 9b3b29a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -12,17 +12,17 @@ all: build test
 
 depflite: $(FLITEDIR)/flite $(FLITEDIR)/cmu_us_aup.flitevox
 
-$(FLITEDIR)/flite: $(FLITEDIR)/flite-1.5.6-go.tar.bz2
-	cd $(FLITEDIR) && tar xvjf flite-1.5.6-go.tar.bz2 && \
-		cd flite && CFLAGS="-DCST_AUDIO_NONE -DCST_NO_SOCKETS" ./configure --with-pic --with-audio=none --with-mmap=none && make
+$(FLITEDIR)/flite: $(FLITEDIR)/flite-2.0.0-release.tar.bz2
+	cd $(FLITEDIR) && tar xvjf flite-2.0.0-release.tar.bz2 && \
+		ln -s flite-2.0.0-release flite && cd flite && CFLAGS="-DCST_AUDIO_NONE -DCST_NO_SOCKETS" ./configure --with-pic --with-audio=none --with-mmap=none && make
 
-$(FLITEDIR)/flite-1.5.6-go.tar.bz2:
+$(FLITEDIR)/flite-2.0.0-release.tar.bz2:
 	mkdir -p $(FLITEDIR)
-	cd $(FLITEDIR) && wget "http://tts.speech.cs.cmu.edu/aup/distr/flite-1.5.6-go.tar.bz2";
+	cd $(FLITEDIR) && wget "http://www.festvox.org/flite/packed/flite-2.0/flite-2.0.0-release.tar.bz2";
 
 $(FLITEDIR)/cmu_us_aup.flitevox:
 	mkdir -p $(FLITEDIR)
-	cd $(FLITEDIR) && wget "http://tts.speech.cs.cmu.edu/aup/distr/cmu_us_aup.flitevox";
+	cd $(FLITEDIR) && wget "http://www.festvox.org/flite/packed/flite-2.0/voices/cmu_us_aup.flitevox";
 
 build: depflite
 	go build

diff --git a/flitewrap.c b/flitewrap.c
@@ -10,7 +10,8 @@
 // Initialize Flite
 void flitewrap_init() {
   flite_init();
-  flite_add_lang("usenglish",usenglish_init,cmulex_init);
+  flite_add_lang("eng",usenglish_init,cmulex_init);
+  flite_add_lang("cmu_indic_lang",cmu_indic_lang_init,cmu_indic_lex_init);
   flite_voice_list = val_reverse(cons_val(voice_val(register_cmu_us_slt(NULL)),flite_voice_list));
 }
 

diff --git a/flitewrap.h b/flitewrap.h
@@ -10,6 +10,10 @@
 
 void usenglish_init(cst_voice *v);
 cst_lexicon *cmulex_init(void);
+
+void cmu_indic_lang_init(cst_voice *v);
+cst_lexicon *cmu_indic_lex_init(void);
+
 cst_voice *register_cmu_us_slt(const char *voxdir);
 cst_voice *unregister_cmu_us_slt();
 

diff --git a/goflite.go b/goflite.go
@@ -10,10 +10,10 @@ package goflite
 // +build linux,cgo
 
 /*
- #cgo CFLAGS: -I. -I dep/flite/include
- #cgo linux,amd64 LDFLAGS: dep/flite/build/x86_64-linux-gnu/lib/libflite_cmu_us_slt.a dep/flite/build/x86_64-linux-gnu/lib/libflite_cmulex.a dep/flite/build/x86_64-linux-gnu/lib/libflite_usenglish.a dep/flite/build/x86_64-linux-gnu/lib/libflite.a -lm
+ #cgo CFLAGS: -I ${SRCDIR} -I${SRCDIR}/dep/flite/include
+ #cgo linux,amd64 LDFLAGS: ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite_cmu_us_slt.a ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite_cmulex.a ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite_usenglish.a ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite_cmu_indic_lex.a ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite_cmu_indic_lang.a ${SRCDIR}/dep/flite/build/x86_64-linux-gnu/lib/libflite.a -lm
 
- #cgo linux,386   LDFLAGS: dep/flite/build/i386-linux-gnu/lib/libflite_cmu_us_slt.a dep/flite/build/i386-linux-gnu/lib/libflite_cmulex.a dep/flite/build/i386-linux-gnu/lib/libflite_usenglish.a dep/flite/build/i386-linux-gnu/lib/libflite.a -lm
+ #cgo linux,386   LDFLAGS: ${SRCDIR}/dep/flite/build/i386-linux-gnu/lib/libflite_cmu_us_slt.a ${SRCDIR}dep/flite/build/i386-linux-gnu/lib/libflite_cmulex.a ${SRCDIR}/dep/flite/build/i386-linux-gnu/lib/libflite_usenglish.a  ${SRCDIR}dep/flite/build/i386-linux-gnu/lib/libflite_cmu_indic_lex.a ${SRCDIR}/dep/flite/build/i386-linux-gnu/lib/libflite_cmu_indic_lang.a ${SRCDIR}/dep/flite/build/i386-linux-gnu/lib/libflite.a -lm
 
  #include <flitewrap.h>
  #include <flite.h>