[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] moved module_main.c from ivona.c to Makefile.am
From: |
Christopher Brannon |
Subject: |
[PATCH 8/9] moved module_main.c from ivona.c to Makefile.am |
Date: |
Mon, 06 Sep 2010 08:15:39 -0500 |
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>
- [PATCH 2/9] moved module_main.c from cicero.c to Makefile.am, (continued)
- [PATCH 2/9] moved module_main.c from cicero.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 3/9] moved module_main.c from espeak.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 4/9] moved module_main.c from festival.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 5/9] moved module.main.c from flite.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 6/9] moved module_main.c from generic.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 7/9] moved module_main.c from ibmtts.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 8/9] moved module_main.c from ivona.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 9/9] moved fdsetconv.c from module_utils.c to Makefile.am, Andrei Kholodnyi, 2010/09/04
- [PATCH 9/9] moved fdsetconv.c from module_utils.c to Makefile.am, Christopher Brannon, 2010/09/08
- [PATCH 9/9] moved fdsetconv.c from module_utils.c to Makefile.am, Andrei Kholodnyi, 2010/09/08
- [PATCH 8/9] moved module_main.c from ivona.c to Makefile.am,
Christopher Brannon <=
- [PATCH 8/9] moved module_main.c from ivona.c to Makefile.am, Andrei Kholodnyi, 2010/09/06
- [PATCH 4/9] moved module_main.c from festival.c to Makefile.am, Christopher Brannon, 2010/09/06
- [PATCH 4/9] moved module_main.c from festival.c to Makefile.am, Andrei Kholodnyi, 2010/09/06
- [PATCH 4/9] moved module_main.c from festival.c to Makefile.am, Andrei Kholodnyi, 2010/09/06
[PATCH 1/9] moved module_main.c from the dummy.c to Makefile.am, William Hubbs, 2010/09/04