[svn-commits] file: trunk r2525 - in /trunk: ./ fxotune.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu May 17 11:51:39 2007
New Revision: 2525

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2525
Log:
Merged revisions 2524 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2524 | file | 2007-05-17 12:49:56 -0400 (Thu, 17 May 2007) | 2 lines

Allow the fxotune config file to be specified instead of hardcoded. (issue #8444 reported by pupeno, patch by tzafrir)

........

Modified:
    trunk/   (props changed)
    trunk/fxotune.c

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

Modified: trunk/fxotune.c
URL: http://svn.digium.com/view/zaptel/trunk/fxotune.c?view=diff&rev=2525&r1=2524&r2=2525
==============================================================================
--- trunk/fxotune.c (original)
+++ trunk/fxotune.c Thu May 17 11:51:39 2007
@@ -52,6 +52,7 @@
 "		options : [-b <device>][-w <waveform>]\n"
 "		   [-n <dialstring>][-l <delaytosilence>][-m <silencegoodfor>]\n"
 "	-v : more output (-vv, -vvv also)\n"
+"       -c <config_file>\n"
 "\n"
 "		<calibtype>      - type of calibration\n"
 "		                   (default 2, old method 1)\n"
@@ -66,7 +67,10 @@
 "		<device>         - the device to perform waveform dump on\n"
 "		                   (default 1)\n"
 "		<waveform>       - -1 for multitone waveform, or frequency of\n"
-"		                   single tone (default -1)\n";
+"		                   single tone (default -1)\n"
+"               <config_file>    - Alternative file to set from / calibrate to.\n"
+"                                  (Default: /etc/fxotune.conf)\n"
+;
 
 
 #define OUT_OF_BOUNDS(x) ((x) < 0 || (x) > 255)
@@ -919,6 +923,9 @@
 					if (argv[i+1][0] != '-' && argv[i+1][0] != '/')
 						dialstr = argv[++i];
 				}
+				continue;
+			case 'c':
+				configfile = moreargs ? argv[++i] : configfile;
 				continue;
 			case 'd':
 				dodump = 1;