[Playerstage-commit] code/player/server/drivers/speech festival.cc, 1.14, 1.15

[Brian G. <ge...@us...>]

Update of /cvsroot/playerstage/code/player/server/drivers/speech
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24782/server/drivers/speech

Modified Files:
	festival.cc 
Log Message:
applied patches 1671417, 1660887, 1660260

Index: festival.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/speech/festival.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** festival.cc	27 Feb 2006 18:19:03 -0000	1.14
--- festival.cc	14 Mar 2007 16:41:52 -0000	1.15
***************
*** 99,105 ****
  #define DEFAULT_FESTIVAL_PORTNUM 1314
  /* change this if Festival is installed somewhere else*/
! #define DEFAULT_FESTIVAL_LIBDIR "/usr/local/festival/lib"
  #define DEFAULT_QUEUE_LEN 4
  
  #include <deque>
  using namespace std;
--- 99,111 ----
  #define DEFAULT_FESTIVAL_PORTNUM 1314
  /* change this if Festival is installed somewhere else*/
! /* HHAA 14-02-2007 */
! //#define DEFAULT_FESTIVAL_LIBDIR "/usr/local/festival/lib"
! #define DEFAULT_FESTIVAL_LIBDIR "/usr/share/festival/"
  #define DEFAULT_QUEUE_LEN 4
  
+ /* HHAA 13-02-2007 */
+ #define DEFAULT_FESTIVAL_LANGUAGE "english"
+ 
+ 
  #include <deque>
  using namespace std;
***************
*** 112,115 ****
--- 118,123 ----
      int portnum;  // port number where Festival will run (default 1314)
      char festival_libdir_value[MAX_FILENAME_SIZE]; // the libdir
+     /* HHAA 14-02-2007 */
+     char festival_language[10];
  
      /* a queue to hold incoming speech strings */
***************
*** 184,188 ****
            cf->ReadString(section, "libdir", DEFAULT_FESTIVAL_LIBDIR),
            sizeof(festival_libdir_value));
! 	
  
  /*  queuelen = cf->ReadInt(section, "queuelen", DEFAULT_QUEUE_LEN);
--- 192,198 ----
            cf->ReadString(section, "libdir", DEFAULT_FESTIVAL_LIBDIR),
            sizeof(festival_libdir_value));
!   strncpy(festival_language,
!           cf->ReadString(section, "language", DEFAULT_FESTIVAL_LANGUAGE),
!           sizeof(festival_language));	
  
  /*  queuelen = cf->ReadInt(section, "queuelen", DEFAULT_QUEUE_LEN);
***************
*** 210,213 ****
--- 220,227 ----
    char festival_server_flag[] = "--server";
    char festival_libdir_flag[] = "--libdir";
+   /* HHAA 12-02-2007 */
+   char festival_language_flag[] = "--language";
+   /* HHAA 12-02-2007 */ 
+   //char festival_language[] = "spanish";
    //char festival_libdir_value[] = DEFAULT_FESTIVAL_LIBDIR;
  
***************
*** 236,239 ****
--- 250,261 ----
      festival_args[i++] = festival_libdir_value;
    }
+ 
+   /* HHAA 13-02-2007 */
+   fprintf(stdout, "festival language %s\n", festival_language);
+   if(strcmp(DEFAULT_FESTIVAL_LANGUAGE,festival_language))
+   {
+   festival_args[i++] = festival_language_flag;
+   festival_args[i++] = festival_language;
+   }
    festival_args[i] = (char*)NULL;