mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-10 08:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the encoding.h API public.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-05-02 18:40:16 +01:00
parent 55bfbb4754
commit 9af96da469
21 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/encoding.h → src/include/espeak-ng/encoding.h
+39 -10
View File
@@ -22,47 +22,76 @@ extern "C"
{
#endif
typedef enum
{
ESPEAKNG_ENCODING_UNKNOWN,
ESPEAKNG_ENCODING_US_ASCII,
ESPEAKNG_ENCODING_ISO_8859_1,
ESPEAKNG_ENCODING_ISO_8859_2,
ESPEAKNG_ENCODING_ISO_8859_3,
ESPEAKNG_ENCODING_ISO_8859_4,
ESPEAKNG_ENCODING_ISO_8859_5,
ESPEAKNG_ENCODING_ISO_8859_6,
ESPEAKNG_ENCODING_ISO_8859_7,
ESPEAKNG_ENCODING_ISO_8859_8,
ESPEAKNG_ENCODING_ISO_8859_9,
ESPEAKNG_ENCODING_ISO_8859_10,
ESPEAKNG_ENCODING_ISO_8859_11,
// ISO-8859-12 is not a valid encoding.
ESPEAKNG_ENCODING_ISO_8859_13,
ESPEAKNG_ENCODING_ISO_8859_14,
ESPEAKNG_ENCODING_ISO_8859_15,
ESPEAKNG_ENCODING_ISO_8859_16,
ESPEAKNG_ENCODING_KOI8_R,
ESPEAKNG_ENCODING_ISCII,
ESPEAKNG_ENCODING_UTF_8,
ESPEAKNG_ENCODING_ISO_10646_UCS_2,
} espeak_ng_ENCODING;
ESPEAK_NG_API espeak_ng_ENCODING
espeak_ng_EncodingFromName(const char *encoding);
typedef struct espeak_ng_TEXT_DECODER_ espeak_ng_TEXT_DECODER;
espeak_ng_TEXT_DECODER *
ESPEAK_NG_API espeak_ng_TEXT_DECODER *
create_text_decoder(void);
void
ESPEAK_NG_API void
destroy_text_decoder(espeak_ng_TEXT_DECODER *decoder);
espeak_ng_STATUS
ESPEAK_NG_API espeak_ng_STATUS
text_decoder_decode_string(espeak_ng_TEXT_DECODER *decoder,
const char *string,
int length,
espeak_ng_ENCODING encoding);
espeak_ng_STATUS
ESPEAK_NG_API espeak_ng_STATUS
text_decoder_decode_string_auto(espeak_ng_TEXT_DECODER *decoder,
const char *string,
int length,
espeak_ng_ENCODING encoding);
espeak_ng_STATUS
ESPEAK_NG_API espeak_ng_STATUS
text_decoder_decode_wstring(espeak_ng_TEXT_DECODER *decoder,
const wchar_t *string,
int length);
espeak_ng_STATUS
ESPEAK_NG_API espeak_ng_STATUS
text_decoder_decode_string_multibyte(espeak_ng_TEXT_DECODER *decoder,
const void *input,
espeak_ng_ENCODING encoding,
int flags);
int
ESPEAK_NG_API int
text_decoder_eof(espeak_ng_TEXT_DECODER *decoder);
uint32_t
ESPEAK_NG_API uint32_t
text_decoder_getc(espeak_ng_TEXT_DECODER *decoder);
uint32_t
ESPEAK_NG_API uint32_t
text_decoder_peekc(espeak_ng_TEXT_DECODER *decoder);
const void *
ESPEAK_NG_API const void *
text_decoder_get_buffer(espeak_ng_TEXT_DECODER *decoder);
#ifdef __cplusplus
src/include/espeak-ng/espeak_ng.h
-31
View File
@@ -184,37 +184,6 @@ espeak_ng_CompilePhonemeDataPath(long rate,
FILE *log,
espeak_ng_ERROR_CONTEXT *context);
/* eSpeak NG 1.49.2 */
typedef enum
{
ESPEAKNG_ENCODING_UNKNOWN,
ESPEAKNG_ENCODING_US_ASCII,
ESPEAKNG_ENCODING_ISO_8859_1,
ESPEAKNG_ENCODING_ISO_8859_2,
ESPEAKNG_ENCODING_ISO_8859_3,
ESPEAKNG_ENCODING_ISO_8859_4,
ESPEAKNG_ENCODING_ISO_8859_5,
ESPEAKNG_ENCODING_ISO_8859_6,
ESPEAKNG_ENCODING_ISO_8859_7,
ESPEAKNG_ENCODING_ISO_8859_8,
ESPEAKNG_ENCODING_ISO_8859_9,
ESPEAKNG_ENCODING_ISO_8859_10,
ESPEAKNG_ENCODING_ISO_8859_11,
// ISO-8859-12 is not a valid encoding.
ESPEAKNG_ENCODING_ISO_8859_13,
ESPEAKNG_ENCODING_ISO_8859_14,
ESPEAKNG_ENCODING_ISO_8859_15,
ESPEAKNG_ENCODING_ISO_8859_16,
ESPEAKNG_ENCODING_KOI8_R,
ESPEAKNG_ENCODING_ISCII,
ESPEAKNG_ENCODING_UTF_8,
ESPEAKNG_ENCODING_ISO_10646_UCS_2,
} espeak_ng_ENCODING;
ESPEAK_NG_API espeak_ng_ENCODING
espeak_ng_EncodingFromName(const char *encoding);
#ifdef __cplusplus
}
#endif
src/libespeak-ng/compiledict.c
+1 -1
View File
@@ -30,8 +30,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "error.h"
#include "speech.h"
#include "phoneme.h"
src/libespeak-ng/dictionary.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/encoding.c
+5 -1
View File
@@ -23,9 +23,9 @@
#include <wchar.h>
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/encoding.h>
#include "speech.h"
#include "encoding.h"
#define LEADING_2_BITS 0xC0 // 0b11000000
#define UTF8_TAIL_BITS 0x80 // 0b10000000
@@ -688,6 +688,8 @@ static const encoding_t string_decoders[] = {
{ string_decoder_getc_iso_10646_ucs_2, NULL },
};
#pragma GCC visibility push(default)
espeak_ng_TEXT_DECODER *
create_text_decoder(void)
{
@@ -818,3 +820,5 @@ text_decoder_get_buffer(espeak_ng_TEXT_DECODER *decoder)
return NULL;
return decoder->current;
}
#pragma GCC visibility pop
src/libespeak-ng/espeak_api.c
+1 -1
View File
@@ -25,8 +25,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/intonation.c
+1 -1
View File
@@ -26,8 +26,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/numbers.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/phonemelist.c
+1 -1
View File
@@ -26,8 +26,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/readclause.c
+1 -1
View File
@@ -33,9 +33,9 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "error.h"
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/setlengths.c
+1 -1
View File
@@ -26,8 +26,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/speech.c
+1 -1
View File
@@ -46,8 +46,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/synth_mbrola.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/synthdata.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "error.h"
#include "speech.h"
#include "phoneme.h"
src/libespeak-ng/synthesize.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/tokenizer.c
+1 -1
View File
@@ -25,9 +25,9 @@
#include <string.h>
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/encoding.h>
#include <ucd/ucd.h>
#include "encoding.h"
#include "tokenizer.h"
#include "speech.h"
#include "phoneme.h"
src/libespeak-ng/tr_languages.c
+1 -1
View File
@@ -28,8 +28,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/translate.c
+1 -1
View File
@@ -29,8 +29,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
src/libespeak-ng/voices.c
+1 -1
View File
@@ -36,8 +36,8 @@
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
tests/encoding.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <espeak-ng/espeak_ng.h>
#include "encoding.h"
#include <espeak-ng/encoding.h>
void
test_unbound_text_decoder()
tests/tokenizer.c
+1 -1
View File
@@ -27,8 +27,8 @@
#include <sys/stat.h>
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/encoding.h>
#include "encoding.h"
#include "tokenizer.h"
#include "speech.h"
#include "phoneme.h"