Version 0.1.10 from FTP

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@398 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 13 insertions, 9 deletions

diff --git a/say.c b/say.c
index 02216e8d6..baa30c7c6 100755
--- a/say.c
+++ b/say.c
@@ -17,7 +17,7 @@
 #include <asterisk/say.h>
 #include <stdio.h>
 
-int ast_say_digit_str(struct ast_channel *chan, char *fn2, char *lang)
+int ast_say_digit_str(struct ast_channel *chan, char *fn2, char *ints, char *lang)
 {
 	char fn[256] = "";
 	int num = 0;
@@ -26,26 +26,26 @@ int ast_say_digit_str(struct ast_channel *chan, char *fn2, char *lang)
 		snprintf(fn, sizeof(fn), "digits/%c", fn2[num]);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res) 
-			res = ast_waitstream(chan, AST_DIGIT_ANY);
+			res = ast_waitstream(chan, ints);
 		ast_stopstream(chan);
 		num++;
 	}
 	return res;
 }
 
-int ast_say_digits(struct ast_channel *chan, int num, char *lang)
+int ast_say_digits(struct ast_channel *chan, int num, char *ints, char *lang)
 {
 	char fn2[256];
 	snprintf(fn2, sizeof(fn2), "%d", num);
-	return ast_say_digit_str(chan, fn2, lang);
+	return ast_say_digit_str(chan, fn2, ints, lang);
 }
-int ast_say_number(struct ast_channel *chan, int num, char *language)
+int ast_say_number(struct ast_channel *chan, int num, char *ints, char *language)
 {
 	int res = 0;
 	int playh = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits(chan, 0,language);
+		return ast_say_digits(chan, 0,ints, language);
 	if (0) {
 	/* XXX Only works for english XXX */
 	} else {
@@ -70,12 +70,16 @@ int ast_say_number(struct ast_channel *chan, int num, char *language)
 					num -= ((num / 100) * 100);
 				} else {
 					if (num < 1000000) {
-						ast_say_number(chan, num / 1000, language);
+						res = ast_say_number(chan, num / 1000, ints, language);
+						if (res)
+							return res;
 						num = num % 1000;
 						snprintf(fn, sizeof(fn), "digits/thousand");
 					} else {
 						if (num < 1000000000) {
-							ast_say_number(chan, num / 1000000, language);
+							res = ast_say_number(chan, num / 1000000, ints, language);
+							if (res)
+								return res;
 							num = num % 1000000;
 							snprintf(fn, sizeof(fn), "digits/million");
 						} else {
@@ -88,7 +92,7 @@ int ast_say_number(struct ast_channel *chan, int num, char *language)
 			if (!res) {
 				res = ast_streamfile(chan, fn, language);
 				if (!res) 
-					res = ast_waitstream(chan, AST_DIGIT_ANY);
+					res = ast_waitstream(chan, ints);
 				ast_stopstream(chan);
 			}