diff -crN ./gnopernicus/braille/libbrl/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/braille/libbrl/Makefile.am *** ./gnopernicus/braille/libbrl/Makefile.am Wed Aug 20 18:02:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/braille/libbrl/Makefile.am Mon Nov 3 16:00:41 2003 *************** *** 7,17 **** -I$(top_srcdir)/srconf/libsrconf \ -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \ -DTTYNAME0=\"$(TTYNAME_0)\" -DTTYNAME1=\"$(TTYNAME_1)\" \ ! $(BRLTTY_ACTIVE) \ ! $(LIBBRL_CFLAGS) \ ! -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBBRL_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la \ ../../srutil/srutil.la \ --- 7,15 ---- -I$(top_srcdir)/srconf/libsrconf \ -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \ -DTTYNAME0=\"$(TTYNAME_0)\" -DTTYNAME1=\"$(TTYNAME_1)\" \ ! $(LIBBRL_CFLAGS) ! LDFLAGS = $(LIBBRL_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la \ ../../srutil/srutil.la \ diff -crN ./gnopernicus/gnopi/cmdmapui.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/gnopi/cmdmapui.c *** ./gnopernicus/gnopi/cmdmapui.c Wed Aug 6 08:30:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/gnopi/cmdmapui.c Tue Nov 4 13:23:52 2003 *************** *** 332,338 **** str[POS_DIGIT_3]); delimit = g_strrstr (str, KEY_NAME_SEPARATOR); ! (const gchar*)tmp = str; if (delimit) tmp = delimit + 1; --- 332,338 ---- str[POS_DIGIT_3]); delimit = g_strrstr (str, KEY_NAME_SEPARATOR); ! tmp = str; if (delimit) tmp = delimit + 1; *************** *** 382,388 **** } delimit = g_strrstr (str, KEY_SEPARATOR); ! (const gchar*)tmp = str; if (delimit) tmp = delimit + 1; --- 382,388 ---- } delimit = g_strrstr (str, KEY_SEPARATOR); ! tmp = str; if (delimit) tmp = delimit + 1; *************** *** 785,791 **** line = alt || shift || ctrl ; ! (const gchar*)key = cmdui_get_key_keystring (gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (cb_key_list)->entry))); if (!key || strlen (key) == 0) return rv; --- 785,791 ---- line = alt || shift || ctrl ; ! key = cmdui_get_key_keystring (gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (cb_key_list)->entry))); if (!key || strlen (key) == 0) return rv; diff -crN ./gnopernicus/gnopi/presui.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/gnopi/presui.c *** ./gnopernicus/gnopi/presui.c Tue Aug 26 10:17:47 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/gnopi/presui.c Tue Nov 4 13:24:58 2003 *************** *** 495,501 **** gtk_entry_set_text (GTK_ENTRY (et_pres_add_chunks), et_chunk); g_free (et_chunk); ! // presui_refresh_entry (); } --- 495,501 ---- gtk_entry_set_text (GTK_ENTRY (et_pres_add_chunks), et_chunk); g_free (et_chunk); ! /* presui_refresh_entry (); */ } diff -crN ./gnopernicus/kbd_mouse/libke/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/kbd_mouse/libke/Makefile.am *** ./gnopernicus/kbd_mouse/libke/Makefile.am Fri Apr 11 14:11:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/kbd_mouse/libke/Makefile.am Mon Nov 3 16:42:13 2003 *************** *** 7,13 **** $(LIBKE_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBKE_LIBS) @LT_VERSION_INFO@ LDADD = ../../srutil/srutil.la ../../srconf/libsrconf/libsrconf.la $(LIBKE_LIBS) $(X_LIBS) --- 7,13 ---- $(LIBKE_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBKE_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srutil/srutil.la ../../srconf/libsrconf/libsrconf.la $(LIBKE_LIBS) $(X_LIBS) diff -crN ./gnopernicus/magnifier/libmag/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/magnifier/libmag/Makefile.am *** ./gnopernicus/magnifier/libmag/Makefile.am Wed Aug 13 15:54:09 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/magnifier/libmag/Makefile.am Mon Nov 3 16:47:42 2003 *************** *** 6,12 **** $(LIBMAG_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS =$(LIBMAG_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBMAG_LIBS) --- 6,12 ---- $(LIBMAG_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS =$(LIBMAG_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBMAG_LIBS) diff -crN ./gnopernicus/speech/libsrs/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/speech/libsrs/Makefile.am *** ./gnopernicus/speech/libsrs/Makefile.am Fri Apr 11 14:12:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/speech/libsrs/Makefile.am Mon Nov 3 17:09:29 2003 *************** *** 6,12 **** $(LIBSRS_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRS_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBSRS_LIBS) --- 6,12 ---- $(LIBSRS_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRS_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBSRS_LIBS) diff -crN ./gnopernicus/speech/libsrs/spviavoice.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/speech/libsrs/spviavoice.c *** ./gnopernicus/speech/libsrs/spviavoice.c Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/speech/libsrs/spviavoice.c Thu Jul 17 08:28:56 2003 *************** *** 0 **** --- 1,236 ---- + /* spviavoice.c + * + * Copyright 2001, 2002 Sun Microsystems, Inc., + * Copyright 2001, 2002 BAUM Retec, A.G. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + #include + #include + #include + #include + #include + + #include "spviavoice.h" + + + /*#define VV_DEBUG*/ + + #define VERSION_LENGTH 20 + + #define ERR_LENGTH 100 + #define ERR_NO 7 + + #define INITERROR 0 + #define SYSTEMERROR 1 + #define MEMORYERROR 2 + #define MODULELOADERROR 3 + #define DELTAERROR 4 + #define SYNTHERROR 5 + #define DEVICEERROR 6 + + #define VV_ERR 0 + #define VV_OK 1 + + /* __ GLOBALS ___*/ + + ECIHand hECI; + char eci_err_msg[ERR_LENGTH]; + char *eci_errors[ERR_NO] = + { + "Could not create ECI handle. Check installation.\n \ + Possible causes:\n \ + \tIBM ViaVoice TTS RTK has not been installed on this machine.\n \ + \tno exported ECIINI variable in /etc/profile.\n \ + \teci.ini file not in path referenced by ECIINI, nor in current directory.\n \ + \teci.ini corrupted.\n \ + \tlibrary /usr/lib/libibmeci50.so corrupted or missing.\n\ + \tlanguage files referenced in eci.ini file corrupted or missing.\n \ + Re-install IBM ViaVoice TTS RTK.\n", + + "Operating system returned an error.", + "System resources low.", + "Unable to load necessary program module.", + "Error in Delta program.", + "Error in synthesis engine.", + "Error using sound device." + }; + + typedef struct voice { + int gender ;/* 0|1 - male | female [`vgN] */ + int headsize ;/* 0-100 - 100 = very deep voice [`vhN] */ + int pitch_base;/* 0-100(40-422 RWU) [`vbN] */ + int pitch_fluc;/* 0-100 - 100 =very exicited [`vfN] */ + int roughness ;/* 0-100 - smooth - rough [`vrN] */ + int speed ;/* 0-250(70-1297 RWU) */ + /* number of words spoken per minute [`vsN] */ + int volume ;/* 0-100(1-65535 RWU) [`vvN] */ + int breathy ;/* 0-100 - 100=whisper [`vyN] */ + }vv_voice; + + typedef struct param { + int SynthMode ;/* 0|1 - Sentence (default)| Manual + (the way input buffer is handled) */ + int InputType ;/* 0|1 - Plain (default)| Annoteted */ + int TextMode ;/* 0|1|2|3 - Default | AlphaSpell | AllSpell | IRCSpell */ + int Dictionary ;/* 0|1 - Abbreviation dictionaries used | unused */ + int SampleRate ;/* 0|1|2 - 8000 | 11,025 (default) | 22,050 + samples per second */ + int WantPhonemeIndices;/* 0|1 - Phoneme indeces are not (default) | + are genrated (used with callbacks) */ + int RealWorldUnits ;/* 0|1 - ECI units(default) |RWU */ + int LanguageDialect ;/* eciGeneralAmericanEnglish | eciBritishEnglish | + eciCastilianSpanish | eciMexicanSpanich | + eciStandardFrench | eciStandardGerman | + eciStandardItalian | eciBrazilianPortuguese */ + int NumberMode ;/* 0|1 - Pronounce 4 digit numbers as "nonyears" | + "years"(default) */ + int PhrasePrediction ; + int NumParams ; + }vv_param; + + + /* __ API ___ */ + + void vv_error(char* source) + { + int err_flags; + + eciErrorMessage(hECI,eci_err_msg); + fprintf(stderr,"%s : %s\n", source, eci_err_msg); + + err_flags = eciProgStatus(hECI); + if ( err_flags & ECI_SYSTEMERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[SYSTEMERROR]); + if ( err_flags & ECI_MEMORYERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[MEMORYERROR]); + if ( err_flags & ECI_MODULELOADERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[MODULELOADERROR]); + if ( err_flags & ECI_DELTAERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[DELTAERROR]); + if ( err_flags & ECI_SYNTHERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[SYNTHERROR]); + if ( err_flags & ECI_DEVICEERROR ) + fprintf(stderr,"%s : %s\n", source, eci_errors[DEVICEERROR]); + + eciClearErrors(hECI); + } + + + void vv_say (const char *voice, const char *string) + { + + #ifdef VV_DEBUG + fprintf (stderr, "vv_say: voice:\"%s\" text:\"%s\"\n", voice, string); + #endif + if ( !eciAddText(hECI,string) ) + { + vv_error("vv_say [eciAddText]"); + } + + if ( !eciSynthesize(hECI) ) + { + vv_error("vv_say [eciSynthesize]"); + } + /* + if ( eciSynchronize(hECI) == false ) + { + vv_error("vv_say"); + } + */ + if ( !eciClearInput(hECI) ) + { + vv_error("vv_say [eciClearInput]"); + } + + } + + void vv_speak (SRS_VOICE* voice, SRS_TEXT* text ) + { + /* !!! TBI !!! map all voice parameter to the acutal voice here */ + if (text) + { + if (voice) + { + vv_say (voice->TTSVoiceName, text->Text); + } + else + { + vv_say (voice->TTSVoiceName, text->Text); + } + } + } + + void vv_shut_up() + { + if ( eciStop(hECI) == false) + { + vv_error("vv_shut_up"); + } + } + /* + void vv_pause(Boolean pause_on) + { + if ( eciPause(hECI,pause_on) == false) + { + vv_error("vv_pause"); + } + + } + */ + int vv_init (TTS_ENGINE* engine) + { + char version[VERSION_LENGTH]; + hECI = eciNew(); + + if ( hECI == NULL_ECI_HAND ) + { + fprintf(stderr,"vv_init : %s\n", eci_errors[INITERROR]); + return -1; + } + + eciVersion(version); + #ifdef VV_DEBUG + fprintf(stderr, "Welcome to Via Voice TTS Version %s.\n",version); + #endif + /* eciTestPhrase(hECI);this could be used to test the ViaVoice */ + + /* parse annotated text */ + eciSetParam(hECI,eciInputType,1); + + /* synthesis and input clearing is controlled by commands only */ + eciSetParam(hECI,eciSynthMode,1); + + /* !!! TBI !!! store the callback address */ + + /* fill the engine structure with the functions */ + engine->ShutUp = vv_shut_up; + engine->Speak = vv_speak; + engine->Terminate = vv_terminate; + + return VV_OK; + + } + + void vv_terminate () + { + if ( hECI == NULL_ECI_HAND ) return; + + eciDelete (hECI); + hECI = NULL_ECI_HAND; + } + diff -crN ./gnopernicus/srconf/libsrconf/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srconf/libsrconf/Makefile.am *** ./gnopernicus/srconf/libsrconf/Makefile.am Thu Jul 3 13:43:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srconf/libsrconf/Makefile.am Mon Nov 3 17:13:15 2003 *************** *** 8,14 **** $(LIBSRCONF_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRCONF_LIBS) @LT_VERSION_INFO@ LDADD = ../../srutil/libsrutil.la $(LIBSRCONF_LIBS) --- 8,14 ---- $(LIBSRCONF_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRCONF_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srutil/libsrutil.la $(LIBSRCONF_LIBS) diff -crN ./gnopernicus/srcore/srspc.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srcore/srspc.h *** ./gnopernicus/srcore/srspc.h Mon Aug 4 13:45:55 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srcore/srspc.h Mon Nov 3 17:22:48 2003 *************** *** 92,98 **** SRC_SPEECH_PRIORITY_WARNING, SRC_SPEECH_PRIORITY_SYSTEM, SRC_SPEECH_PRIORITY_MESSAGE, ! SRC_SPEECH_PRIORITY_IDLE, }SRCSpeechPriority; gboolean src_speech_init (); --- 92,98 ---- SRC_SPEECH_PRIORITY_WARNING, SRC_SPEECH_PRIORITY_SYSTEM, SRC_SPEECH_PRIORITY_MESSAGE, ! SRC_SPEECH_PRIORITY_IDLE }SRCSpeechPriority; gboolean src_speech_init (); diff -crN ./gnopernicus/srlow/libsrlow/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srlow/libsrlow/Makefile.am *** ./gnopernicus/srlow/libsrlow/Makefile.am Fri Apr 11 14:12:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srlow/libsrlow/Makefile.am Mon Nov 3 17:23:44 2003 *************** *** 6,12 **** $(LIBSRLOW_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRLOW_LIBS) @LT_VERSION_INFO@ LDADD = $(LIBSRLOW_LIBS) --- 6,12 ---- $(LIBSRLOW_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRLOW_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = $(LIBSRLOW_LIBS) diff -crN ./gnopernicus/srutil/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/Makefile.am *** ./gnopernicus/srutil/Makefile.am Fri Apr 11 14:12:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/Makefile.am Mon Nov 3 16:11:34 2003 *************** *** 6,12 **** $(LIBSRUTIL_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRUTIL_LIBS) @LT_VERSION_INFO@ LDADD = $(LIBSRUTIL_LIBS) --- 6,12 ---- $(LIBSRUTIL_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRUTIL_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = $(LIBSRUTIL_LIBS) diff -crN ./gnopernicus/srutil/SREvent.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/SREvent.h *** ./gnopernicus/srutil/SREvent.h Thu Nov 28 13:20:41 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/SREvent.h Mon Nov 3 16:13:59 2003 *************** *** 57,63 **** SR_EVENT_COMMAND_LAYER, SR_EVENT_HOTKEY, SR_EVENT_KEY, ! SR_EVENT_CONFIG_CHANGED, }SREventType; --- 57,63 ---- SR_EVENT_COMMAND_LAYER, SR_EVENT_HOTKEY, SR_EVENT_KEY, ! SR_EVENT_CONFIG_CHANGED }SREventType; diff -crN ./gnopernicus/srutil/SRMessages.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/SRMessages.h *** ./gnopernicus/srutil/SRMessages.h Mon Jul 21 10:24:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnopernicus/srutil/SRMessages.h Mon Nov 3 16:14:27 2003 *************** *** 56,61 **** --- 56,62 ---- #define sru_check_log_stack_flag(flag) sru_check_flag (sru_log_stack_flags, flag) #define sru_prgname g_get_prgname() + #ifdef G_HAVE_ISO_VARARGS #define sru_assert(X) \ { \ gboolean rv_ = (X) ? TRUE : FALSE; \ *************** *** 95,101 **** if (!rv_) \ return val; \ } - #ifdef G_HAVE_ISO_VARARGS #define sru_error(...) \ { \ if(sru_check_log_stack_flag(G_LOG_LEVEL_ERROR)) \ --- 96,101 ----