diff --git a/festival-1.4.1-diff b/festival-1.4.1-diff deleted file mode 100755 index 23702a3a1c5f31937c50198fa1173aa936967083..0000000000000000000000000000000000000000 --- a/festival-1.4.1-diff +++ /dev/null @@ -1,76 +0,0 @@ -diff -ruN festival/lib/tts.scm myfestival/lib/tts.scm ---- festival/lib/tts.scm Sun May 30 16:40:00 1999 -+++ myfestival/lib/tts.scm Wed Apr 17 22:29:34 2002 -@@ -200,6 +200,15 @@ - (utt.synth - (eval (list 'Utterance 'Text string))))) - -+(define (tts_textasterisk string mode) -+ "(tts_textasterisk STRING MODE) -+Apply tts to STRING. This function is specifically designed for -+use in server mode so a single function call may synthesize the string. -+This function name maybe added to the server safe functions." -+ (utt.send.wave.asterisk -+ (utt.synth -+ (eval (list 'Utterance 'Text string))))) -+ - (define (tts_return_to_client) - "(tts_return_to_client) - This function is called by clients who wish to return waveforms of -diff -ruN festival/src/arch/festival/wave.cc myfestival/src/arch/festival/wave.cc ---- festival/src/arch/festival/wave.cc Sat Jun 12 10:30:30 1999 -+++ myfestival/src/arch/festival/wave.cc Thu Apr 18 10:55:32 2002 -@@ -375,6 +375,38 @@ - type = "nist"; - else - type = get_c_string(ltype); -+ -+ w->save(tmpfile,type); -+ write(ft_server_socket,"WV\n",3); -+ socket_send_file(ft_server_socket,tmpfile); -+ unlink(tmpfile); -+ -+ return utt; -+} -+ -+static LISP utt_send_wave_asterisk(LISP utt) -+{ -+ // Send the waveform to a client (must be acting as server) -+ EST_Utterance *u = utterance(utt); -+ EST_Wave *w; -+ EST_String tmpfile = make_tmp_filename(); -+ LISP ltype; -+ EST_String type; -+ -+ w = get_utt_wave(u); -+ if (ft_server_socket == -1) -+ { -+ cerr << "utt_send_wave_client: not in server mode" << endl; -+ festival_error(); -+ } -+ -+ ltype = ft_get_param("Wavefiletype"); -+ if (ltype == NIL) -+ type = "nist"; -+ else -+ type = get_c_string(ltype); -+ w->resample(8000); -+ w->rescale(5); - w->save(tmpfile,type); - write(ft_server_socket,"WV\n",3); - socket_send_file(ft_server_socket,tmpfile); -@@ -434,6 +466,13 @@ - "(utt.send.wave.client UTT)\n\ - Sends wave in UTT to client. If not in server mode gives an error\n\ - Note the client must be expecting to receive the waveform."); -+ -+ init_subr_1("utt.send.wave.asterisk",utt_send_wave_asterisk, -+ "(utt.send.wave.asterisk UTT)\n\ -+ Sends wave in UTT to client. If not in server mode gives an error\n\ -+ Note the client must be expecting to receive the waveform. The waveform\n\ -+ is rescaled and resampled according to what asterisk needs"); -+ - init_subr_2("utt.save.f0",utt_save_f0, - "(utt.save.f0 UTT FILENAME)\n\ - Save F0 of UTT as esps track file in FILENAME."); - diff --git a/festival-1.4.2.diff b/festival-1.4.2.diff deleted file mode 100755 index d5d1e5d54c43bed6b409eb68d278edb8b97d020b..0000000000000000000000000000000000000000 --- a/festival-1.4.2.diff +++ /dev/null @@ -1,75 +0,0 @@ -diff -u -r festival-1.4.2/lib/tts.scm festival-1.4.2-asterisk/lib/tts.scm ---- festival-1.4.2/lib/tts.scm Wed Jan 8 09:54:14 2003 -+++ festival-1.4.2-asterisk/lib/tts.scm Tue Jan 7 08:51:44 2003 -@@ -236,6 +236,15 @@ - (utt.synth - (eval (list 'Utterance 'Text string)))))) - -+(define (tts_textasterisk string mode) -+ "(tts_textasterisk STRING MODE) -+Apply tts to STRING. This function is specifically designed for -+use in server mode so a single function call may synthesize the string. -+This function name may be added to the server safe functions." -+ (utt.send.wave.asterisk -+ (utt.synth -+ (eval (list 'Utterance 'Text string))))) -+ - (define (tts_return_to_client) - "(tts_return_to_client) - This function is called by clients who wish to return waveforms of -diff -u -r festival-1.4.2/src/arch/festival/wave.cc festival-1.4.2-asterisk/src/arch/festival/wave.cc ---- festival-1.4.2/src/arch/festival/wave.cc Mon Jun 4 07:40:10 2001 -+++ festival-1.4.2-asterisk/src/arch/festival/wave.cc Tue Jan 7 08:53:09 2003 -@@ -377,6 +377,38 @@ - type = "nist"; - else - type = get_c_string(ltype); -+ -+ w->save(tmpfile,type); -+ write(ft_server_socket,"WV\n",3); -+ socket_send_file(ft_server_socket,tmpfile); -+ unlink(tmpfile); -+ -+ return utt; -+} -+ -+static LISP utt_send_wave_asterisk(LISP utt) -+{ -+ // Send the waveform to a client (must be acting as server) -+ EST_Utterance *u = utterance(utt); -+ EST_Wave *w; -+ EST_String tmpfile = make_tmp_filename(); -+ LISP ltype; -+ EST_String type; -+ -+ w = get_utt_wave(u); -+ if (ft_server_socket == -1) -+ { -+ cerr << "utt_send_wave_client: not in server mode" << endl; -+ festival_error(); -+ } -+ -+ ltype = ft_get_param("Wavefiletype"); -+ if (ltype == NIL) -+ type = "nist"; -+ else -+ type = get_c_string(ltype); -+ w->resample(8000); -+ w->rescale(5); - w->save(tmpfile,type); - write(ft_server_socket,"WV\n",3); - socket_send_file(ft_server_socket,tmpfile); -@@ -454,6 +486,13 @@ - "(utt.send.wave.client UTT)\n\ - Sends wave in UTT to client. If not in server mode gives an error\n\ - Note the client must be expecting to receive the waveform."); -+ -+ init_subr_1("utt.send.wave.asterisk",utt_send_wave_asterisk, -+ "(utt.send.wave.asterisk UTT)\n\ -+ Sends wave in UTT to client. If not in server mode gives an error\n\ -+ Note the client must be expecting to receive the waveform. The waveform\n\ -+ is rescaled and resampled according to what asterisk needs"); -+ - init_subr_1("send_sexpr_to_client", send_sexpr_to_client, - "(send_sexpr_to_client SEXPR)\n\ - Sends given sexpression to currently connected client."); diff --git a/festival-1.4.3.diff b/festival-1.4.3.diff deleted file mode 100755 index 13a9d92b898d2dffe60de70c41a0a49045759681..0000000000000000000000000000000000000000 --- a/festival-1.4.3.diff +++ /dev/null @@ -1,93 +0,0 @@ -diff -u -r festival-1.4.3/lib/tts.scm festival-1.4.3-asterisk/lib/tts.scm ---- festival-1.4.3/lib/tts.scm 2003-01-09 07:39:22.000000000 -0800 -+++ festival-1.4.3-asterisk/lib/tts.scm 2003-08-14 12:07:00.000000000 -0700 -@@ -234,6 +234,17 @@ - (utt.synth - (eval (list 'Utterance 'Text string)))))) - -+;; begin tts_textasterisk -+(define (tts_textasterisk string mode) -+ "(tts_textasterisk STRING MODE) -+Apply tts to STRING. This function is specifically designed for -+use in server mode so a single function call may synthesize the string. -+This function name may be added to the server safe functions." -+ (utt.send.wave.asterisk -+ (utt.synth -+ (eval (list 'Utterance 'Text string))))) -+;; end tts_textasterisk -+ - (define (tts_return_to_client) - "(tts_return_to_client) - This function is called by clients who wish to return waveforms of -diff -u -r festival-1.4.3/src/arch/festival/wave.cc festival-1.4.3-asterisk/src/arch/festival/wave.cc ---- festival-1.4.3/src/arch/festival/wave.cc 2003-01-13 11:09:55.000000000 -0800 -+++ festival-1.4.3-asterisk/src/arch/festival/wave.cc 2003-08-14 12:10:53.000000000 -0700 -@@ -381,6 +381,7 @@ - type = "nist"; - else - type = get_c_string(ltype); -+ - w->save(tmpfile,type); - #ifdef WIN32 - send(ft_server_socket,"WV\n",3,0); -@@ -393,6 +394,44 @@ - return utt; - } - -+// begin utt_send_wave_asterisk() -+static LISP utt_send_wave_asterisk(LISP utt) -+{ -+ // Send the waveform to a client (must be acting as server) -+ EST_Utterance *u = utterance(utt); -+ EST_Wave *w; -+ EST_String tmpfile = make_tmp_filename(); -+ LISP ltype; -+ EST_String type; -+ -+ w = get_utt_wave(u); -+ if (ft_server_socket == -1) -+ { -+ cerr << "utt_send_wave_client: not in server mode" << endl; -+ festival_error(); -+ } -+ -+ ltype = ft_get_param("Wavefiletype"); -+ if (ltype == NIL) -+ type = "nist"; -+ else -+ type = get_c_string(ltype); -+ w->resample(8000); -+ w->rescale(5); -+ -+ w->save(tmpfile,type); -+#ifdef WIN32 -+ send(ft_server_socket,"WV\n",3,0); -+#else -+ write(ft_server_socket,"WV\n",3); -+#endif -+ socket_send_file(ft_server_socket,tmpfile); -+ unlink(tmpfile); -+ -+ return utt; -+} -+// end utt_send_wave_asterisk() -+ - static LISP send_sexpr_to_client(LISP l) - { - EST_String tmpfile = make_tmp_filename(); -@@ -465,6 +504,15 @@ - "(utt.send.wave.client UTT)\n\ - Sends wave in UTT to client. If not in server mode gives an error\n\ - Note the client must be expecting to receive the waveform."); -+ -+// begin asterisk mod -+ init_subr_1("utt.send.wave.asterisk",utt_send_wave_asterisk, -+ "(utt.send.wave.asterisk UTT)\n\ -+ Sends wave in UTT to client. If not in server mode gives an error\n\ -+ Note the client must be expecting to receive the waveform. The waveform\n\ -+ is rescaled and resampled according to what asterisk needs"); -+// end asterisk mod -+ - init_subr_1("send_sexpr_to_client", send_sexpr_to_client, - "(send_sexpr_to_client SEXPR)\n\ - Sends given sexpression to currently connected client.");