[asterisk-commits] pabelanger: trunk r292414 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Oct 20 19:09:53 2010
New Revision: 292414

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292414
Log:
Merged revisions 292413 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292413 | pabelanger | 2010-10-20 20:07:17 -0400 (Wed, 20 Oct 2010) | 24 lines
  
  Merged revisions 292412 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r292412 | pabelanger | 2010-10-20 20:05:45 -0400 (Wed, 20 Oct 2010) | 17 lines
    
    Merged revisions 292411 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r292411 | pabelanger | 2010-10-20 20:00:51 -0400 (Wed, 20 Oct 2010) | 10 lines
      
      Record priv-recordintro as sln, not gsm
      
      This removes the gsm->sln step when transcoding
      priv-recordintro.
      
      (closes issue #18176)
      Reported by: pabelanger
      Patches: 
            chan_sip.diff uploaded by pabelanger (license 224)
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=292414&r1=292413&r2=292414
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Oct 20 19:09:53 2010
@@ -1695,7 +1695,7 @@
 			*/
 			silencethreshold = ast_dsp_get_threshold_from_settings(THRESHOLD_SILENCE);
 			ast_answer(chan);
-			res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "gsm", &duration, silencethreshold, 2000, 0);  /* NOTE: I've reduced the total time to 4 sec */
+			res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "sln", &duration, silencethreshold, 2000, 0);  /* NOTE: I've reduced the total time to 4 sec */
 									/* don't think we'll need a lock removed, we took care of
 									   conflicts by naming the pa.privintro file */
 			if (res == -1) {