[PATCH 8/9] moved module_main.c from ivona.c to Makefile.am

[Christopher Brannon]

Andrei Kholodnyi <andrei.kholodnyi at gmail.com> writes:

> diff --git a/src/modules/ivona.c b/src/modules/ivona.c
> index 68e10de..d1a744b 100644
> --- a/src/modules/ivona.c
> +++ b/src/modules/ivona.c
> @@ -43,6 +43,10 @@
*SNIP*
> @@ -338,7 +340,7 @@ _ivona_speak(void* nothing)
>               DBG("Got icon");
>           }
>           if (!audio && !icon[0]) {
> -             if(!msg || !*msg || ivona_get_msgpart(&msg,&icon,&buf,&len)) {
> +             if(!msg || !*msg || ivona_get_msgpart(ivona_conf, 
> ivona_message_type, &msg,&icon,&buf,&len,ivona_cap_mode, IvonaDelimiters, 
> ivona_punct_mode, IvonaPunctuationSome)) {
>                 ivona_speaking=0;
*SNIP*
> diff --git a/src/modules/ivona_client.c b/src/modules/ivona_client.c
> index ab7423c..7d920c9 100644
> --- a/src/modules/ivona_client.c
> +++ b/src/modules/ivona_client.c
*SNIP*
> -int ivona_get_msgpart(char **msg,char *icon,char **buf,int *len)
> +int ivona_get_msgpart(struct dumbtts_conf *conf, EMessageType type, char 
> **msg,char *icon,char **buf,int *len, int cap_mode, char *delimeters, int 
> punct_mode, char * punct_some)

The call disagrees with the definition.  You're passing a char ** for
the icon argument, while the function expects a char *.
Also, you need to fix the other call site in ivona.c.

I'd suggest making a new header file, ivona_client.h, containing
declarations from ivona_client.c.  I did that for OpenTTS.

Finally, this patch will conflict with today's HEAD of the master
branch, due to Trevor's recent Ivona patch.

Thanks,
-- Chris
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://lists.freebsoft.org/pipermail/speechd/attachments/20100906/a4c44a87/attachment.pgp>