Browse Source

Make the tokenizer.h API public.

master
Reece H. Dunn 8 years ago
parent
commit
683579f403
3 changed files with 11 additions and 7 deletions
  1. 5
    5
      src/include/espeak-ng/tokenizer.h
  2. 5
    1
      src/libespeak-ng/tokenizer.c
  3. 1
    1
      tests/tokenizer.c

src/libespeak-ng/tokenizer.h → src/include/espeak-ng/tokenizer.h View File

@@ -24,10 +24,10 @@ extern "C"

typedef struct espeak_ng_TOKENIZER_ espeak_ng_TOKENIZER;

espeak_ng_TOKENIZER *
ESPEAK_NG_API espeak_ng_TOKENIZER *
create_tokenizer(void);

void
ESPEAK_NG_API void
destroy_tokenizer(espeak_ng_TOKENIZER *tokenizer);

typedef enum
@@ -35,7 +35,7 @@ typedef enum
ESPEAKNG_TOKENIZER_OPTION_TEXT = 0,
} espeak_ng_TOKENIZER_OPTIONS;

int
ESPEAK_NG_API int
tokenizer_reset(espeak_ng_TOKENIZER *tokenizer,
espeak_ng_TEXT_DECODER *decoder,
espeak_ng_TOKENIZER_OPTIONS options);
@@ -60,10 +60,10 @@ typedef enum
ESPEAKNG_TOKEN_ELLIPSIS,
} espeak_ng_TOKEN_TYPE;

espeak_ng_TOKEN_TYPE
ESPEAK_NG_API espeak_ng_TOKEN_TYPE
tokenizer_read_next_token(espeak_ng_TOKENIZER *tokenizer);

const char *
ESPEAK_NG_API const char *
tokenizer_get_token_text(espeak_ng_TOKENIZER *tokenizer);

#ifdef __cplusplus

+ 5
- 1
src/libespeak-ng/tokenizer.c View File

@@ -26,9 +26,9 @@

#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/encoding.h>
#include <espeak-ng/tokenizer.h>
#include <ucd/ucd.h>

#include "tokenizer.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"
@@ -334,6 +334,8 @@ tokenizer_state_default(espeak_ng_TOKENIZER *tokenizer)
return ESPEAKNG_TOKEN_END_OF_BUFFER;
}

#pragma GCC visibility push(default)

espeak_ng_TOKENIZER *
create_tokenizer(void)
{
@@ -378,3 +380,5 @@ tokenizer_get_token_text(espeak_ng_TOKENIZER *tokenizer)
{
return tokenizer->token;
}

#pragma GCC visibility pop

+ 1
- 1
tests/tokenizer.c View File

@@ -28,8 +28,8 @@

#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/encoding.h>
#include <espeak-ng/tokenizer.h>

#include "tokenizer.h"
#include "speech.h"
#include "phoneme.h"
#include "synthesize.h"

Loading…
Cancel
Save