[svn-commits] russell: branch 1.6.1 r209841 - in /branches/1.6.1: ./ apps/app_milliwatt.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Aug  1 06:03:52 2009
New Revision: 209841

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

................
  r209839 | russell | 2009-08-01 06:02:07 -0500 (Sat, 01 Aug 2009) | 20 lines
  
  Merged revisions 209838 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r209838 | russell | 2009-08-01 05:59:05 -0500 (Sat, 01 Aug 2009) | 13 lines
    
    Modify how Playtones() is used in Milliwatt() to resolve gain issue.
    
    When Milliwatt() was changed internally to use Playtones() so that the proper
    tone was used, it introduced a drop in gain in the output signal.  So, use
    the playtones API directly and specify a volume argument such that the output
    matches the gain of the original Milliwatt() code.
    
    (closes issue #15386)
    Reported by: rue_mohr
    Patches:
          issue_15386.rev2.diff uploaded by russell (license 2)
    Tested by: rue_mohr
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_milliwatt.c

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

Modified: branches/1.6.1/apps/app_milliwatt.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_milliwatt.c?view=diff&rev=209841&r1=209840&r2=209841
==============================================================================
--- branches/1.6.1/apps/app_milliwatt.c (original)
+++ branches/1.6.1/apps/app_milliwatt.c Sat Aug  1 06:03:52 2009
@@ -36,6 +36,7 @@
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
+#include "asterisk/indications.h"
 
 static char *app = "Milliwatt";
 
@@ -133,19 +134,13 @@
 static int milliwatt_exec(struct ast_channel *chan, void *data)
 {
 	const char *options = data;
-	struct ast_app *playtones_app;
 	int res = -1;
 
 	if (!ast_strlen_zero(options) && strchr(options, 'o')) {
 		return old_milliwatt_exec(chan);
 	}
 
-	if (!(playtones_app = pbx_findapp("Playtones"))) {
-		ast_log(LOG_ERROR, "The Playtones application is required to run Milliwatt()\n");
-		return -1;
-	}
-
-	res = pbx_exec(chan, playtones_app, "1004/1000");
+	res = ast_playtones_start(chan, 23255, "1004/1000", 0);
 
 	while (!res) {
 		res = ast_safe_sleep(chan, 10000);