mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-14 01:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the unused size parameter in the sync_espeak_Synth commands.

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-02 14:44:01 +00:00
parent 7569d1c4c3
commit b843d2a415
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/espeak_command.c
+2 -2
View File
@@ -379,7 +379,7 @@ void process_espeak_command(t_espeak_command *the_command)
case ET_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->end_position, data->flags, data->user_data);
}
@@ -387,7 +387,7 @@ void process_espeak_command(t_espeak_command *the_command)
case ET_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->user_data);
}
src/libespeak-ng/espeak_command.h
+2 -2
View File
@@ -133,10 +133,10 @@ void process_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 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,
unsigned int flags, void *user_data);
void sync_espeak_Key(const char *key);
src/libespeak-ng/speech.c
+8 -8
View File
@@ -511,12 +511,10 @@ void MarkerEvent(int type, unsigned int char_position, int value, int value2, un
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 end_position, unsigned int flags, void *user_data)
{
(void)size; // unused
espeak_ERROR aStatus;
InitText(flags);
@@ -552,12 +550,10 @@ espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text,
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,
unsigned int flags, void *user_data)
{
(void)size; // unused
espeak_ERROR aStatus;
InitText(flags);
@@ -645,6 +641,8 @@ ESPEAK_API espeak_ERROR espeak_Synth(const void *text, size_t size,
unsigned int end_position, unsigned int flags,
unsigned int *unique_identifier, void *user_data)
{
(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);
@@ -658,7 +656,7 @@ ESPEAK_API espeak_ERROR espeak_Synth(const void *text, size_t size,
*unique_identifier = 0;
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
// Create the text command
@@ -693,6 +691,8 @@ ESPEAK_API espeak_ERROR espeak_Synth_Mark(const void *text, size_t size,
unsigned int *unique_identifier,
void *user_data)
{
(void)size; // unused
espeak_ERROR a_error = EE_OK;
static unsigned int temp_identifier;
@@ -704,7 +704,7 @@ ESPEAK_API espeak_ERROR espeak_Synth_Mark(const void *text, size_t size,
*unique_identifier = 0;
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
// Create the mark command