Merged revisions 147714 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r147714 | mmichelson | 2008-10-08 17:32:37 -0500 (Wed, 08 Oct 2008) | 8 lines

Some small tweaks regarding realtime conference announcements.

(closes issue #13522)
Reported by: DEA
Patches:
      meetme-rt-fixes.txt uploaded by DEA (license 3)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147719 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

@@ -2031,16 +2031,15 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 			if (rt_schedule) {
 				if (now.tv_sec % 60 == 0) {
 					if (!checked) {
-						if (now.tv_sec > conf->endtime) {
-							ast_verbose("Quitting time...\n");
+						if (now.tv_sec >= conf->endtime) {
 							goto outrun;
 						}
 
 						if (!announcement_played && conf->endalert) {
-							if (now.tv_sec + conf->endalert > conf->endtime) {
+							if (now.tv_sec + conf->endalert >= conf->endtime) {
 								if (!ast_streamfile(chan, "conf-will-end-in", chan->language))
 									ast_waitstream(chan, "");
-								ast_say_digits(chan, (now.tv_sec + conf->endalert - conf->endtime) / 60, "", chan->language);
+								ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language);
 								if (!ast_streamfile(chan, "minutes", chan->language))
 									ast_waitstream(chan, "");
 								announcement_played = 1;