File: src_modules_diphone_diphone.cc.diff

package info (click to toggle)
festival 1%3A2.0.95~beta-5.1
  • links: PTS, VCS
  • area: main
  • in suites: squeeze
  • size: 5,448 kB
  • ctags: 4,437
  • sloc: cpp: 26,214; lisp: 14,961; ansic: 5,076; sh: 4,989; java: 1,536; makefile: 790; xml: 291; perl: 87
file content (34 lines) | stat: -rw-r--r-- 1,083 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
This patch is part of a series of patches for festival for
Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer.

Index: b/src/modules/diphone/diphone.cc
===================================================================
--- a/src/modules/diphone/diphone.cc
+++ b/src/modules/diphone/diphone.cc
@@ -180,6 +180,8 @@
 	db->group_encoding = di_raw;
     else if (streq(db->group_encoding_str,"ulaw"))
 	db->group_encoding = di_ulaw;
+    else if (streq(db->group_encoding_str,"alaw"))
+	db->group_encoding = di_alaw;
     else
     {
 	cerr << "Diphone: unknown group encoding" << endl;
@@ -218,7 +220,7 @@
     {
 	wfree(db->indx[0]->diph);  // ptr to the whole diphname table
 	wfree(db->allsignal);
-	wfree(db->allulawsignal);
+	wfree(db->allualawsignal);
 	wfree(db->allframes);
     }
     for (i=0; i < db->nindex; i++)
@@ -275,7 +277,7 @@
     db->alternates_before = NIL;
     db->alternates_after = NIL;
     db->allsignal = 0;
-    db->allulawsignal = 0;
+    db->allualawsignal = 0;
     db->offsets = 0;
     db->gfd = 0;
     db->default_diphone = 0;