From cf872e5e5a5566e1f884ccd88a89e06ab6917f9b Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 12 Dec 2015 13:36:34 +0000
Subject: [PATCH] Use espeak-ng to build the mbrola voices, not espeakedit.

---
 Makefile.am        | 142 ++++++++++++++++++++++-----------------------
 src/espeakedit.cpp |  11 ----
 2 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f4ca4afa..7120bae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -856,146 +856,146 @@ mbrola: \
 	espeak-data/mbrola_ph/us3_phtrans \
 	espeak-data/mbrola_ph/vz_phtrans
 
-espeak-data/mbrola_ph/af1_phtrans: phsource/mbrola/af1 src/espeakedit
+espeak-data/mbrola_ph/af1_phtrans: phsource/mbrola/af1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/cr1_phtrans: phsource/mbrola/cr1 src/espeakedit
+espeak-data/mbrola_ph/cr1_phtrans: phsource/mbrola/cr1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/cs_phtrans: phsource/mbrola/cs src/espeakedit
+espeak-data/mbrola_ph/cs_phtrans: phsource/mbrola/cs src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/de2_phtrans: phsource/mbrola/de2 src/espeakedit
+espeak-data/mbrola_ph/de2_phtrans: phsource/mbrola/de2 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/de4_phtrans: phsource/mbrola/de4 src/espeakedit
+espeak-data/mbrola_ph/de4_phtrans: phsource/mbrola/de4 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/de6_phtrans: phsource/mbrola/de6 src/espeakedit
+espeak-data/mbrola_ph/de6_phtrans: phsource/mbrola/de6 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ee1_phtrans: phsource/mbrola/ee1 src/espeakedit
+espeak-data/mbrola_ph/ee1_phtrans: phsource/mbrola/ee1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/en1_phtrans: phsource/mbrola/en1 src/espeakedit
+espeak-data/mbrola_ph/en1_phtrans: phsource/mbrola/en1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/es_phtrans: phsource/mbrola/es src/espeakedit
+espeak-data/mbrola_ph/es_phtrans: phsource/mbrola/es src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeakedit
+espeak-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeakedit
+espeak-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/grc-de6_phtrans: phsource/mbrola/grc-de6 src/espeakedit
+espeak-data/mbrola_ph/grc-de6_phtrans: phsource/mbrola/grc-de6 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
 espeak-data/mbrola_ph/hn1_phtrans: phsource/mbrola/hn1 src/espeakedit
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/hu1_phtrans: phsource/mbrola/hu1 src/espeakedit
+espeak-data/mbrola_ph/hu1_phtrans: phsource/mbrola/hu1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ic1_phtrans: phsource/mbrola/ic1 src/espeakedit
+espeak-data/mbrola_ph/ic1_phtrans: phsource/mbrola/ic1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/id1_phtrans: phsource/mbrola/id1 src/espeakedit
+espeak-data/mbrola_ph/id1_phtrans: phsource/mbrola/id1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/in1_phtrans: phsource/mbrola/in1 src/espeakedit
+espeak-data/mbrola_ph/in1_phtrans: phsource/mbrola/in1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ir1_phtrans: phsource/mbrola/ir1 src/espeakedit
+espeak-data/mbrola_ph/ir1_phtrans: phsource/mbrola/ir1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/it3_phtrans: phsource/mbrola/it3 src/espeakedit
+espeak-data/mbrola_ph/it3_phtrans: phsource/mbrola/it3 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/la1_phtrans: phsource/mbrola/la1 src/espeakedit
+espeak-data/mbrola_ph/la1_phtrans: phsource/mbrola/la1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/lt1_phtrans: phsource/mbrola/lt1 src/espeakedit
+espeak-data/mbrola_ph/lt1_phtrans: phsource/mbrola/lt1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/lt2_phtrans: phsource/mbrola/lt2 src/espeakedit
+espeak-data/mbrola_ph/lt2_phtrans: phsource/mbrola/lt2 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/mx1_phtrans: phsource/mbrola/mx1 src/espeakedit
+espeak-data/mbrola_ph/mx1_phtrans: phsource/mbrola/mx1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/mx2_phtrans: phsource/mbrola/mx2 src/espeakedit
+espeak-data/mbrola_ph/mx2_phtrans: phsource/mbrola/mx2 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/nl_phtrans: phsource/mbrola/nl src/espeakedit
+espeak-data/mbrola_ph/nl_phtrans: phsource/mbrola/nl src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/pl1_phtrans: phsource/mbrola/pl1 src/espeakedit
+espeak-data/mbrola_ph/pl1_phtrans: phsource/mbrola/pl1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/pt1_phtrans: phsource/mbrola/pt1 src/espeakedit
+espeak-data/mbrola_ph/pt1_phtrans: phsource/mbrola/pt1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ptbr_phtrans: phsource/mbrola/ptbr src/espeakedit
+espeak-data/mbrola_ph/ptbr_phtrans: phsource/mbrola/ptbr src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ptbr4_phtrans: phsource/mbrola/ptbr4 src/espeakedit
+espeak-data/mbrola_ph/ptbr4_phtrans: phsource/mbrola/ptbr4 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/ro1_phtrans: phsource/mbrola/ro1 src/espeakedit
+espeak-data/mbrola_ph/ro1_phtrans: phsource/mbrola/ro1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/sv_phtrans: phsource/mbrola/sv src/espeakedit
+espeak-data/mbrola_ph/sv_phtrans: phsource/mbrola/sv src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/sv2_phtrans: phsource/mbrola/sv2 src/espeakedit
+espeak-data/mbrola_ph/sv2_phtrans: phsource/mbrola/sv2 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/tr1_phtrans: phsource/mbrola/tr1 src/espeakedit
+espeak-data/mbrola_ph/tr1_phtrans: phsource/mbrola/tr1 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/us_phtrans: phsource/mbrola/us src/espeakedit
+espeak-data/mbrola_ph/us_phtrans: phsource/mbrola/us src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/us3_phtrans: phsource/mbrola/us3 src/espeakedit
+espeak-data/mbrola_ph/us3_phtrans: phsource/mbrola/us3 src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
 
-espeak-data/mbrola_ph/vz_phtrans: phsource/mbrola/vz src/espeakedit
+espeak-data/mbrola_ph/vz_phtrans: phsource/mbrola/vz src/espeak-ng
 	mkdir -p espeak-data/mbrola_ph
-	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile-mbrola ${PWD}/$<
+	ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=$<
diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp
index 8c5b7345..11085472 100644
--- a/src/espeakedit.cpp
+++ b/src/espeakedit.cpp
@@ -149,17 +149,6 @@ if(argc > 1)
 		CompilePhonemeData();
 		CompileIntonation();
 	}
-	else if(argc > 2 && strcmp(param,"--compile-mbrola")==0)
-	{
-		samplerate_native = samplerate = 22050;
-		LoadPhData(NULL);
-		if(LoadVoice("", 0) == NULL)
-		{
-			fprintf(stderr, "Failed to load default voice\n");
-			exit(1);
-		}
-		espeak_ng_CompileMbrolaVoice(argv[2], stdout);
-	}
     exit(0);
 }