[asterisk-commits] mmichelson: branch 1.6.0 r174949 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Feb 11 17:04:10 2009
New Revision: 174949

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174949
Log:
Merged revisions 174948 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r174948 | mmichelson | 2009-02-11 17:03:08 -0600 (Wed, 11 Feb 2009) | 35 lines
  
  Merged revisions 174945 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r174945 | mmichelson | 2009-02-11 16:41:01 -0600 (Wed, 11 Feb 2009) | 29 lines
    
    Fix 'd' option for app_dial and add new option to Answer application
    
    The 'd' option would not work for channel types which use RTP to transport
    DTMF digits. The only way to allow for this to work was to answer the channel
    if we saw that this option was enabled.
    
    I realized that this may cause issues with CDRs, specifically with giving false
    dispositions and answer times. I therefore modified ast_answer to take another
    parameter which would tell if the CDR should be marked answered.
    
    I also extended this to the Answer application so that the channel may be answered
    but not CDRified if desired.
    
    I also modified app_dictate and app_waitforsilence to only answer the channel if it
    is not already up, to help not allow for faulty CDR answer times.
    
    All of these changes are going into Asterisk trunk. For 1.6.0 and 1.6.1, however, all
    the changes except for the change to the Answer application will go in since we do
    not introduce new features into stable branches
    
    (closes issue #14164)
    Reported by: DennisD
    Patches:
          14164.patch uploaded by putnopvut (license 60)
    Tested by: putnopvut
    
    Review: http://reviewboard.digium.com/r/145
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=174949&r1=174948&r2=174949
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Feb 11 17:04:10 2009
@@ -1834,6 +1834,7 @@
 static int say_position(struct queue_ent *qe, int ringing)
 {
 	int res = 0, avgholdmins, avgholdsecs;
+	int say_thanks = 1;
 	time_t now;
 
 	/* Let minannouncefrequency seconds pass between the start of each position announcement */
@@ -1916,7 +1917,8 @@
 			if (res)
 				goto playout;
 		}
-
+	} else if (qe->parent->announceholdtime && !qe->parent->announceposition) {
+		say_thanks = 0;
 	}
 
 posout:
@@ -1924,7 +1926,9 @@
 		ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
 			qe->chan->name, qe->parent->name, qe->pos);
 	}
-	res = play_file(qe->chan, qe->parent->sound_thanks);
+	if (say_thanks) {
+		res = play_file(qe->chan, qe->parent->sound_thanks);
+	}
 
 playout:
 	if ((res > 0 && !valid_exit(qe, res)) || res < 0)