From 8a40f2bcdb0c0ef1e98176ac13a85da00af2a101 Mon Sep 17 00:00:00 2001 From: Marc Olivier Chouinard Date: Mon, 8 Mar 2010 07:15:59 +0000 Subject: [PATCH] mod_say_fr: Fix the thousand and million speak section changed in r16933 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16934 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/say/mod_say_fr/mod_say_fr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mod/say/mod_say_fr/mod_say_fr.c b/src/mod/say/mod_say_fr/mod_say_fr.c index e6a884a81d..4427c514e6 100644 --- a/src/mod/say/mod_say_fr/mod_say_fr.c +++ b/src/mod/say/mod_say_fr/mod_say_fr.c @@ -101,7 +101,7 @@ static switch_status_t fr_spell(switch_core_session_t *session, char *tosay, swi return SWITCH_STATUS_SUCCESS; } -static switch_status_t play_group(switch_say_args_t *say_args, int a, int b, int c, char *what, switch_core_session_t *session, switch_input_args_t *args) +static switch_status_t play_group(switch_say_method_t method, switch_say_gender_t gender, int a, int b, int c, char *what, switch_core_session_t *session, switch_input_args_t *args) { int ftdNumber = 0; int itd = (b * 10) + c; @@ -126,7 +126,7 @@ static switch_status_t play_group(switch_say_args_t *say_args, int a, int b, int if (b && ftdNumber == 0) { /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=%d b=[%d] c=%d\n",a, b,c);*/ if (c == 0) { - if (say_args->method == SSM_COUNTED) { + if (method == SSM_COUNTED) { say_file("digits/h-%d%d.wav", b, c); } else { say_file("digits/%d%d.wav", b, c); @@ -142,10 +142,10 @@ static switch_status_t play_group(switch_say_args_t *say_args, int a, int b, int if (ftdNumber == 1) fVal = itd; - if (say_args->method == SSM_COUNTED) { + if (method == SSM_COUNTED) { say_file("digits/h-%d.wav", fVal); } else { - if (b != 1 && c == 1 && say_args->gender == SSG_FEMININE) { + if (b != 1 && c == 1 && gender == SSG_FEMININE) { say_file("digits/%d_f.wav", fVal); } else { say_file("digits/%d.wav", fVal); @@ -229,13 +229,13 @@ static switch_status_t fr_say_general_count(switch_core_session_t *session, char switch (say_args->method) { case SSM_COUNTED: case SSM_PRONOUNCED: - if ((status = play_group(say_args, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(SSM_PRONOUNCED, say_args->gender, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(say_args, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(SSM_PRONOUNCED, say_args->gender, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(say_args, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(say_args->method, say_args->gender, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { return status; } break;