[svn-commits] mmichelson: trunk r147714 - /trunk/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Oct  8 17:32:37 2008
New Revision: 147714

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147714
Log:
Some small tweaks regarding realtime conference announcements.

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


Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=147714&r1=147713&r2=147714
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Oct  8 17:32:37 2008
@@ -2172,16 +2172,16 @@
 							extended = 1;
 						}
 
-						if (conf->endtime && (now.tv_sec > conf->endtime)) {
+						if (conf->endtime && (now.tv_sec >= conf->endtime)) {
 							ast_verbose("Quitting time...\n");
 							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;