Browse Source

Create an espeak-ng version of espeak_SetParameter.

master
Reece H. Dunn 9 years ago
parent
commit
93898d7960

+ 5
- 0
src/include/espeak-ng/espeak_ng.h View File

ESPEAK_NG_API int ESPEAK_NG_API int
espeak_ng_GetSampleRate(void); espeak_ng_GetSampleRate(void);


ESPEAK_NG_API espeak_ng_STATUS
espeak_ng_SetParameter(espeak_PARAMETER parameter,
int value,
int relative);

ESPEAK_NG_API espeak_ng_STATUS ESPEAK_NG_API espeak_ng_STATUS
espeak_ng_Synthesize(const void *text, espeak_ng_Synthesize(const void *text,
size_t size, size_t size,

+ 5
- 0
src/libespeak-ng/espeak_api.c View File

return status_to_espeak_error(espeak_ng_SpeakCharacter(character)); return status_to_espeak_error(espeak_ng_SpeakCharacter(character));
} }


ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative)
{
return status_to_espeak_error(espeak_ng_SetParameter(parameter, value, relative));
}

ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags) ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags)
{ {
espeak_ng_CompileDictionary(path, dictionary_name, log, flags); espeak_ng_CompileDictionary(path, dictionary_name, log, flags);

+ 1
- 1
src/libespeak-ng/espeak_command.h View File

void sync_espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative); void sync_espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative);
int sync_espeak_SetVoiceByName(const char *name); int sync_espeak_SetVoiceByName(const char *name);
int sync_espeak_SetVoiceByProperties(espeak_VOICE *voice_selector); int sync_espeak_SetVoiceByProperties(espeak_VOICE *voice_selector);
void SetParameter(int parameter, int value, int relative);
espeak_ng_STATUS SetParameter(int parameter, int value, int relative);


int sync_espeak_terminated_msg(unsigned int unique_identifier, void *user_data); int sync_espeak_terminated_msg(unsigned int unique_identifier, void *user_data);



+ 4
- 2
src/libespeak-ng/setlengths.c View File



#include "config.h" #include "config.h"


#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <wctype.h> #include <wctype.h>


#endif #endif


void SetParameter(int parameter, int value, int relative)
espeak_ng_STATUS SetParameter(int parameter, int value, int relative)
{ {
// parameter: reset-all, amp, pitch, speed, linelength, expression, capitals, number grouping // parameter: reset-all, amp, pitch, speed, linelength, expression, capitals, number grouping
// relative 0=absolute 1=relative // relative 0=absolute 1=relative
option_tone_flags = new_value; option_tone_flags = new_value;
break; break;
default: default:
break;
return EINVAL;
} }
return ENS_OK;
} }


static void DoEmbedded2(int *embix) static void DoEmbedded2(int *embix)

+ 7
- 12
src/libespeak-ng/speech.c View File

return param_defaults[parameter]; return param_defaults[parameter];
} }


ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative)
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SetParameter(espeak_PARAMETER parameter, int value, int relative)
{ {
#ifdef USE_ASYNC #ifdef USE_ASYNC
espeak_ERROR a_error;

if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) {
SetParameter(parameter, value, relative);
return EE_OK;
}
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
return SetParameter(parameter, value, relative);


t_espeak_command *c = create_espeak_parameter(parameter, value, relative); t_espeak_command *c = create_espeak_parameter(parameter, value, relative);


a_error = status_to_espeak_error(fifo_add_command(c));
if (a_error != EE_OK)
espeak_ng_STATUS status = fifo_add_command(c);
if (status != EE_OK)
delete_espeak_command(c); delete_espeak_command(c);
return a_error;
return status;
#else #else
SetParameter(parameter, value, relative);
return EE_OK;
return SetParameter(parameter, value, relative);
#endif #endif
} }



+ 1
- 1
src/libespeak-ng/synthesize.h View File

extern SOUND_ICON soundicon_tab[N_SOUNDICON_TAB]; extern SOUND_ICON soundicon_tab[N_SOUNDICON_TAB];


espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate); espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate);
void SetParameter(int parameter, int value, int relative);
espeak_ng_STATUS SetParameter(int parameter, int value, int relative);
int MbrolaTranslate(PHONEME_LIST *plist, int n_phonemes, int resume, FILE *f_mbrola); int MbrolaTranslate(PHONEME_LIST *plist, int n_phonemes, int resume, FILE *f_mbrola);
int MbrolaGenerate(PHONEME_LIST *phoneme_list, int *n_ph, int resume); int MbrolaGenerate(PHONEME_LIST *phoneme_list, int *n_ph, int resume);
int MbrolaFill(int length, int resume, int amplitude); int MbrolaFill(int length, int resume, int amplitude);

Loading…
Cancel
Save