File: src_main_festival_main.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 (48 lines) | stat: -rw-r--r-- 1,604 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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
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/main/festival_main.cc
===================================================================
--- a/src/main/festival_main.cc
+++ b/src/main/festival_main.cc
@@ -44,6 +44,9 @@
 
 #include "festival.h"
 
+using std::cerr;
+using std::endl;
+
 static void festival_main(int argc, char **argv);
 static int festival_check_script_mode(int argc, char **argv);
 static void festival_script_mode(int argc, char **argv);
@@ -88,6 +91,8 @@
         "In evaluation mode \"filenames\" starting with ( are evaluated inline\n"+
 	"Festival Speech Synthesis System: "+ festival_version +"\n"+
 	"-q            Load no default setup files\n"+
+	"--datadir <string>\n"+
+	"              Set data directory pathname\n"+
 	"--libdir <string>\n"+
         "              Set library directory pathname\n"+
         "-b            Run in batch mode (no interaction)\n"+
@@ -127,6 +132,12 @@
 	festival_libdir = wstrdup(al.val("--libdir"));
     else if (getenv("FESTLIBDIR") != 0)
 	festival_libdir = getenv("FESTLIBDIR");
+
+    if (al.present("--datadir"))
+	festival_datadir = wstrdup(al.val("--datadir"));
+    else if (getenv("FESTDATADIR") != 0)
+	festival_datadir = getenv("FESTDATADIR");
+
     if (al.present("--heap"))
 	heap_size = al.ival("--heap");
 
@@ -233,7 +244,7 @@
 
     if (argc < 2)
     {   
-	cerr << "festival: script_mode has no file to interpret" << endl;
+	std::cerr << "festival: script_mode has no file to interpret" << std::endl;
 	return;
     }