[asterisk-commits] igorg: trunk r412714 - in /trunk: ./ channels/chan_unistim.c

[SVN commits to the Asterisk project]

Author: igorg
Date: Mon Apr 21 03:36:18 2014
New Revision: 412714

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412714
Log:

Fix wrong dialtone. The "modulation" should not be referenced for tone+tone as it refers to the on-off characteristic - this often resulted in a single tone rather than the multitone as in the UK.
........

Merged revisions 412712 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 412713 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/channels/chan_unistim.c

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

Modified: trunk/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=412714&r1=412713&r2=412714
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Mon Apr 21 03:36:18 2014
@@ -2859,9 +2859,6 @@
 		ind = ast_strdupa(ts->data);
 		s = strsep(&ind, ",");
 		ast_tone_zone_part_parse(s, &tone_data);
-		if (tone_data.modulate) {
-			tone_data.freq2 = 0;
-		}
 		send_tone(pte, tone_data.freq1, tone_data.freq2);
 		if (unistimdebug) {
 			ast_verb(0, "Country code found (%s), freq1=%d freq2=%d\n",