Browse Source

Remove the unused size parameter in the sync_espeak_Synth commands.

master
Reece H. Dunn 9 years ago
parent
commit
b843d2a415

+ 2
- 2
src/libespeak-ng/espeak_command.c View File

case ET_TEXT: case ET_TEXT:
{ {
t_espeak_text *data = &(the_command->u.my_text); t_espeak_text *data = &(the_command->u.my_text);
sync_espeak_Synth(data->unique_identifier, data->text, data->size,
sync_espeak_Synth(data->unique_identifier, data->text,
data->position, data->position_type, data->position, data->position_type,
data->end_position, data->flags, data->user_data); data->end_position, data->flags, data->user_data);
} }
case ET_MARK: case ET_MARK:
{ {
t_espeak_mark *data = &(the_command->u.my_mark); t_espeak_mark *data = &(the_command->u.my_mark);
sync_espeak_Synth_Mark(data->unique_identifier, data->text, data->size,
sync_espeak_Synth_Mark(data->unique_identifier, data->text,
data->index_mark, data->end_position, data->flags, data->index_mark, data->end_position, data->flags,
data->user_data); data->user_data);
} }

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



int delete_espeak_command(t_espeak_command *the_command); int delete_espeak_command(t_espeak_command *the_command);


espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text, size_t size,
espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text,
unsigned int position, espeak_POSITION_TYPE position_type, unsigned int position, espeak_POSITION_TYPE position_type,
unsigned int end_position, unsigned int flags, void *user_data); unsigned int end_position, unsigned int flags, void *user_data);
espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *text, size_t size,
espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *text,
const char *index_mark, unsigned int end_position, const char *index_mark, unsigned int end_position,
unsigned int flags, void *user_data); unsigned int flags, void *user_data);
void sync_espeak_Key(const char *key); void sync_espeak_Key(const char *key);

+ 8
- 8
src/libespeak-ng/speech.c View File

ep->id.number = value; ep->id.number = value;
} }


espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text, size_t size,
espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text,
unsigned int position, espeak_POSITION_TYPE position_type, unsigned int position, espeak_POSITION_TYPE position_type,
unsigned int end_position, unsigned int flags, void *user_data) unsigned int end_position, unsigned int flags, void *user_data)
{ {
(void)size; // unused

espeak_ERROR aStatus; espeak_ERROR aStatus;


InitText(flags); InitText(flags);
return aStatus; return aStatus;
} }


espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *text, size_t size,
espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *text,
const char *index_mark, unsigned int end_position, const char *index_mark, unsigned int end_position,
unsigned int flags, void *user_data) unsigned int flags, void *user_data)
{ {
(void)size; // unused

espeak_ERROR aStatus; espeak_ERROR aStatus;


InitText(flags); InitText(flags);
unsigned int end_position, unsigned int flags, unsigned int end_position, unsigned int flags,
unsigned int *unique_identifier, void *user_data) unsigned int *unique_identifier, void *user_data)
{ {
(void)size; // unused

if (f_logespeak) { 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); 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); fflush(f_logespeak);
*unique_identifier = 0; *unique_identifier = 0;


if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
return sync_espeak_Synth(0, text, size, position, position_type, end_position, flags, user_data);
return sync_espeak_Synth(0, text, position, position_type, end_position, flags, user_data);


#ifdef USE_ASYNC #ifdef USE_ASYNC
// Create the text command // Create the text command
unsigned int *unique_identifier, unsigned int *unique_identifier,
void *user_data) void *user_data)
{ {
(void)size; // unused

espeak_ERROR a_error = EE_OK; espeak_ERROR a_error = EE_OK;
static unsigned int temp_identifier; static unsigned int temp_identifier;


*unique_identifier = 0; *unique_identifier = 0;


if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
return sync_espeak_Synth_Mark(0, text, size, index_mark, end_position, flags, user_data);
return sync_espeak_Synth_Mark(0, text, index_mark, end_position, flags, user_data);


#ifdef USE_ASYNC #ifdef USE_ASYNC
// Create the mark command // Create the mark command

Loading…
Cancel
Save