diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index 49e0142d..9b55c25a 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -639,11 +639,6 @@ ESPEAK_API espeak_ERROR espeak_Synth(const void *text, size_t size, { (void)size; // unused - if (f_logespeak) { - fprintf(f_logespeak, "\nSYNTH posn %d %d %d flags 0x%x\n%s\n", position, end_position, position_type, flags, (const char *)text); - fflush(f_logespeak); - } - espeak_ERROR a_error = EE_INTERNAL_ERROR; static unsigned int temp_identifier; @@ -692,9 +687,6 @@ ESPEAK_API espeak_ERROR espeak_Synth_Mark(const void *text, size_t size, espeak_ERROR a_error = EE_OK; static unsigned int temp_identifier; - if (f_logespeak) - fprintf(f_logespeak, "\nSYNTH MARK %s posn %d flags 0x%x\n%s\n", index_mark, end_position, flags, (const char *)text); - if (unique_identifier == NULL) unique_identifier = &temp_identifier; *unique_identifier = 0; @@ -781,8 +773,6 @@ ESPEAK_API int espeak_GetParameter(espeak_PARAMETER parameter, int current) ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative) { - if (f_logespeak) - fprintf(f_logespeak, "SETPARAM %d %d %d\n", parameter, value, relative); #ifdef USE_ASYNC espeak_ERROR a_error; @@ -923,11 +913,6 @@ ESPEAK_API espeak_ERROR espeak_Terminate(void) FreePhData(); FreeVoiceList(); - if (f_logespeak) { - fclose(f_logespeak); - f_logespeak = NULL; - } - return EE_OK; } diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index edd086f7..e7bb9502 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -44,8 +44,6 @@ const char *version_string = "1.48.15 16.Apr.15"; const int version_phdata = 0x014801; int option_device_number = -1; -FILE *f_logespeak = NULL; -int logging_type; // copy the current phoneme table into here int n_phoneme_tab; @@ -419,8 +417,6 @@ void LoadConfig(void) char *p; char string[200]; - logging_type = 0; - for (ix = 0; ix < N_SOUNDICON_SLOTS; ix++) { soundicon_tab[ix].filename = NULL; soundicon_tab[ix].data = NULL; @@ -433,13 +429,7 @@ void LoadConfig(void) while (fgets(buf, sizeof(buf), f) != NULL) { if (buf[0] == '/') continue; - if (memcmp(buf, "log", 3) == 0) { - if (sscanf(&buf[4], "%d %s", &logging_type, string) == 2) { - if (f_logespeak) - fclose(f_logespeak); - f_logespeak = fopen(string, "w"); - } - } else if (memcmp(buf, "tone", 4) == 0) + if (memcmp(buf, "tone", 4) == 0) ReadTonePoints(&buf[5], tone_points); else if (memcmp(buf, "pa_device", 9) == 0) sscanf(&buf[10], "%d", &option_device_number); diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index a07e6124..74a98c8c 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -1561,15 +1561,6 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa char word_replaced[N_WORD_BYTES+1]; char old_dictionary_name[40]; - if ((f_logespeak != NULL) && (logging_type & 8)) { - fprintf(f_logespeak, "WORD: flg=%.5x len=%d '", wtab->flags, wtab->length); - for (ix = 0; ix < 40; ix++) { - if (word[ix] == 0) break; - fputc(word[ix], f_logespeak); - } - fprintf(f_logespeak, "'\n"); - } - len = wtab->length; if (len > 31) len = 31; source_ix = (wtab->sourceix & 0x7ff) | (len << 11); // bits 0-10 sourceix, bits 11-15 word length @@ -2253,13 +2244,6 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t charix[ix] = 0; terminator = ReadClause(tr, f_text, source, charix, &charix_top, N_TR_SOURCE, &tone2, voice_change_name); - if ((f_logespeak != NULL) && (logging_type & 4)) { - fprintf(f_logespeak, "CLAUSE %x:\n", terminator); - for (p = source; *p != 0; p++) - fputc(*p, f_logespeak); - fprintf(f_logespeak, "ENDCLAUSE\n"); - fflush(f_logespeak); - } p = source; charix[charix_top+1] = 0; diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h index 59e1d8c1..8c32069a 100644 --- a/src/libespeak-ng/translate.h +++ b/src/libespeak-ng/translate.h @@ -775,8 +775,6 @@ void InterpretPhoneme2(int phcode, PHONEME_DATA *phdata); char *WritePhMnemonic(char *phon_out, PHONEME_TAB *ph, PHONEME_LIST *plist, int use_ipa, int *flags); extern FILE *f_trans; // for logging -extern FILE *f_logespeak; -extern int logging_type; // from config file #ifdef __cplusplus }