kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Number reading should now be OK for the whole range of integers for 

Cantonese and Mandarin
This commit is contained in:
Steve Underwood 2010-05-11 09:59:33 +08:00
parent b43eef8522
commit 1d0ce5570d
1 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mod/say/mod_say_zh/mod_say_zh.c
View File

@ -111,19 +111,26 @@ static switch_status_t zh_say_general_count(switch_core_session_t *session, char
switch (i) { switch (i) {
case 0: case 0:
/* Billions column */ /* Billions column */
if (digits[i] != '0') { if (digits[0] != '0') {
if (digits[i] != '1') if (digits[0] != '1')
say_file("digits/%c.wav", digits[i]); say_file("digits/%c.wav", digits[i]);
say_file("digits/10.wav"); say_file("digits/10.wav");
} }
break; break;
case 1: case 1:
/* Hundred millions columns */ /* Hundred millions column */
if (digits[i] != '0') if (digits[i] != '0')
say_file("digits/%c.wav", digits[i]); say_file("digits/%c.wav", digits[i]);
if (memcmp(digits, "00", 2) != 0) if (memcmp(digits, "00", 2) != 0)
say_file("digits/100000000.wav"); say_file("digits/100000000.wav");
break; break;
case 5:
/* Ten thousands column */
if (digits[i] != '0')
say_file("digits/%c.wav", digits[i]);
if (memcmp(digits + 2, "0000", 4) != 0)
say_file("digits/10000.wav");
break;
case 2: case 2:
case 6: case 6:
/* Ten millions or thousands column */ /* Ten millions or thousands column */
@ -138,49 +145,27 @@ static switch_status_t zh_say_general_count(switch_core_session_t *session, char
if (digits[i] != '0') { if (digits[i] != '0') {
say_file("digits/%c.wav", digits[i]); say_file("digits/%c.wav", digits[i]);
say_file("digits/100.wav"); say_file("digits/100.wav");
} else {
if (digits[i + 1] != '0' && memcmp(digits, "00000000", i) != 0)
say_file("digits/0.wav");
} }
break; break;
case 4: case 4:
/* Hundred thousands column */
if (digits[i] != '0') {
if (digits[i] != '1' || memcmp(digits, "0000", 4) != 0) {
say_file("digits/%c.wav", digits[i]);
}
} else {
if (digits[i + 1] != '0' && memcmp(digits, "0000", 4) != 0) {
say_file("digits/%c.wav", digits[i]);
}
}
if (digits[i] != '0')
say_file("digits/10.wav");
break;
case 5:
/* Ten thousands column */
if (digits[i] != '0') {
say_file("digits/%c.wav", digits[i]);
if (memcmp(digits + 2, "0000", 4) != 0)
say_file("digits/10000.wav");
}
break;
case 8: case 8:
/* Tens column */ /* Hundred thousands or tens column */
if (digits[i] != '0') { if (digits[i] != '0') {
if (digits[i] != '1' || memcmp(digits, "00000000", 8) != 0) { if (digits[i] != '1')
say_file("digits/%c.wav", digits[i]); say_file("digits/%c.wav", digits[i]);
}
} else {
if (digits[9] != '0' && memcmp(digits, "00000000", 8) != 0) {
say_file("digits/%c.wav", digits[i]);
}
}
if (digits[8] != '0')
say_file("digits/10.wav"); say_file("digits/10.wav");
} else {
if (digits[i + 1] != '0' && memcmp(digits, "00000000", i) != 0)
say_file("digits/0.wav");
}
break; break;
case 9: case 9:
/* Units column */ /* Units column */
if (digits[9] != '0') if (digits[9] != '0')
say_file("digits/%c.wav", digits[i]); say_file("digits/%c.wav", digits[9]);
break; break;
} }
} }