[Asterisk-cvs] asterisk/apps app_meetme.c,1.23,1.24 app_queue.c,1.57,1.58 app_voicemail.c,1.77,1.78 app_zapscan.c,1.8,1.9

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv13143/apps

Modified Files:
	app_meetme.c app_queue.c app_voicemail.c app_zapscan.c 
Log Message:
Add support for French, Danish, Portuguese, Spanish, Italian, and Dutch numbers


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- app_meetme.c	8 Apr 2004 19:38:26 -0000	1.23
+++ app_meetme.c	29 Apr 2004 02:30:14 -0000	1.24
@@ -621,7 +621,7 @@
 	} else {
 		if (chan->_state != AST_STATE_UP)
 			ast_answer(chan);
-		res = ast_say_number(chan, count, "", chan->language);
+		res = ast_say_number(chan, count, "", chan->language, (char *) NULL); /* Needs gender */
 	}
 	LOCAL_USER_REMOVE(u);
 	return res;

Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- app_queue.c	26 Apr 2004 23:22:33 -0000	1.57
+++ app_queue.c	29 Apr 2004 02:30:14 -0000	1.58
@@ -370,7 +370,7 @@
 		goto posout;
 	} else {
 		res += play_file(qe->chan, qe->parent->sound_thereare);
-		res += ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language);
+		res += ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */
 		res += play_file(qe->chan, qe->parent->sound_calls);
 	}
 
@@ -383,7 +383,7 @@
 	   supposed to be only once and we have already said it, say it */
 	if (avgholdmins > 1 && (qe->parent->announceholdtime) && (!(qe->parent->announceholdtime==1 && qe->last_pos)) ) {
 		res += play_file(qe->chan, qe->parent->sound_holdtime);
-		res += ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, qe->chan->language);
+		res += ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, qe->chan->language, (char*) NULL);
 		res += play_file(qe->chan, qe->parent->sound_minutes);
 	}
 

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- app_voicemail.c	28 Apr 2004 04:33:16 -0000	1.77
+++ app_voicemail.c	29 Apr 2004 02:30:14 -0000	1.78
@@ -1706,7 +1706,7 @@
 static int say_and_wait(struct ast_channel *chan, int num)
 {
 	int d;
-	d = ast_say_number(chan, num, AST_DIGIT_ANY, chan->language);
+	d = ast_say_number(chan, num, AST_DIGIT_ANY, chan->language, (char *) NULL);
 	return d;
 }
 
@@ -2270,7 +2270,7 @@
 	if (d)
 		return d;
 	for (x = start; x< 5; x++) {
-		if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, chan->language)))
+		if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, chan->language, (char *) NULL)))
 			return d;
 		d = play_and_wait(chan, "vm-for");
 		if (d)
@@ -2634,7 +2634,7 @@
 		res = wait_file2(chan, vms, "vm-message");
 		if (msg && (msg != vms->lastmsg)) {
 			if (!res)
-				res = ast_say_number(chan, msg + 1, AST_DIGIT_ANY, chan->language);
+				res = ast_say_number(chan, msg + 1, AST_DIGIT_ANY, chan->language, (char *) NULL);
 		}
 	}
 

Index: app_zapscan.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapscan.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_zapscan.c	10 Apr 2004 02:49:06 -0000	1.8
+++ app_zapscan.c	29 Apr 2004 02:30:14 -0000	1.9
@@ -322,7 +322,7 @@
 			}
 			confno = atoi(strchr(confstr,'/') + 1);
 			ast_stopstream(chan);
-			ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language);
+			ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language, (char *) NULL);
 			res = conf_run(chan, confno, confflags);
 			if (res<0) break;
 			input = res;