root / trunk / data / flite / arrays.diff

lang/cmulex/cmu_lex.c

@@ -42 +42 @@
 
 extern const int cmu_lex_entry[];
 extern const unsigned char cmu_lex_data[];
+extern const unsigned char cmu_lex_data_[];
 extern const int cmu_lex_num_entries;
 extern const int cmu_lex_num_bytes;
 extern const char * const cmu_lex_phone_table[54];
@@ -252 +253 @@
 #ifdef CST_NO_STATIC_LEX
     /* cmu_lex.data will be set elsewhere */
 #else
-    cmu_lex.data = cmu_lex_data;
+    cmu_lex.data = malloc(207610 + 209306);
+    memcpy(cmu_lex.data, cmu_lex_data, 207610);
+    memcpy(cmu_lex.data + 207610, cmu_lex_data_, 209306);
 #endif
     cmu_lex.num_bytes = cmu_lex_num_bytes;
     cmu_lex.phone_table = (char **) cmu_lex_phone_table;

lang/cmulex/Makefile

@@ -40 +40 @@
 ALL_DIRS= 
 H = cmu_lts_model.h cmulex.h
 SRCS = cmu_lts_rules.c cmu_lts_model.c \
-       cmu_lex.c cmu_lex_entries.c cmu_lex_data.c
+       cmu_lex_data-0.c cmu_lex_data-1.c \
+       cmu_lex.c cmu_lex_entries.c
 LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \
      cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c
 

lang/cmu_us_kal/cmu_us_kal.c

@@ -46 +46 @@
 static cst_utterance *cmu_us_kal_postlex(cst_utterance *u);
 extern cst_diphone_db cmu_us_kal_db;
 
+extern const unsigned char cmu_us_kal_res[];
+extern const unsigned char cmu_us_kal_res_1_[];
+extern const unsigned char cmu_us_kal_res_2_[];
+extern const unsigned char cmu_us_kal_res_3_[];
+extern const unsigned char cmu_us_kal_res_4_[];
+
 cst_voice *cmu_us_kal_diphone = NULL;
 
 cst_voice *register_cmu_us_kal(const char *voxdir)
 {
+    unsigned char *residuals = malloc(307705 + 302489 + 304535 + 299252 + 301901);
+    memcpy(residuals, cmu_us_kal_res, 307705);
+    memcpy(residuals + 307705, cmu_us_kal_res_1_, 302489);
+    memcpy(residuals + 307705 + 302489, cmu_us_kal_res_2_, 304535);
+    memcpy(residuals + 307705 + 302489 + 304535, cmu_us_kal_res_3_, 299252);
+    memcpy(residuals + 307705 + 302489 + 304535 + 299252, cmu_us_kal_res_4_, 301901);
+    * (unsigned char **) &cmu_us_kal_db.sts->residuals = residuals;
+
     cst_voice *v = new_voice();
 
     /* Set up basic values for synthesizing with this voice */

lang/cmu_us_kal/cmu_us_kal_diphone.c

@@ -5 +5 @@
 #include "cst_diphone.h"
 
 extern const unsigned short cmu_us_kal_lpc[];
-extern const unsigned char cmu_us_kal_res[];
 extern const unsigned int cmu_us_kal_resi[];
 
 
@@ -15 +14 @@
   0,0,0,
 #else
   cmu_us_kal_lpc,
-  cmu_us_kal_res,
+  0,
   cmu_us_kal_resi,
 #endif
   17614,

lang/cmu_us_kal/Makefile

@@ -41 +41 @@
 H = voxdefs.h
 SRCS = cmu_us_kal_diphone.c cmu_us_kal.c \
        cmu_us_kal_lpc.c \
-       cmu_us_kal_res.c \
+       cmu_us_kal_res-0.c \
+       cmu_us_kal_res-1.c \
+       cmu_us_kal_res-2.c \
+       cmu_us_kal_res-3.c \
+       cmu_us_kal_res-4.c \
        cmu_us_kal_residx.c
 OBJS = $(SRCS:.c=.o)
 SCM=

lang/Makefile

@@ -36 +36 @@
 ###########################################################################
 TOP=..
 DIRNAME=lang
-BUILD_DIRS = usenglish cmulex cmu_us_kal cmu_time_awb cmu_us_kal16
+BUILD_DIRS = usenglish cmulex cmu_us_kal cmu_time_awb
 ALL_DIRS= $(BUILD_DIRS)
 FILES = Makefile $(SCM) $(SRCS)