From 5ca5d426469218a269e37e606bb3beda137d1815 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 8 Apr 2014 21:25:15 +0000 Subject: Internal timing: Add notice that the -I and internal_timing option are no longer needed. Add notice messages during execution that the -I command line option and the astersik.conf internal_timing option are no longer needed. The internal timing functionality is now always enabled if there is a timing module loaded. NOTE: Since the command line options and the asterisk.conf config file are processed before the logging system is initialized, the messages are output to stderr. Change requested as a result of asterisk-dev list comments about the commit for ASTERISK-22846 that removed the -I and internal_timing options. Review: https://reviewboard.asterisk.org/r/3423/ ........ Merged revisions 411964 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 411974 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 411985 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411990 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/main/asterisk.c b/main/asterisk.c index 83a451852..3518002b5 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3537,6 +3537,13 @@ static void ast_readconfig(void) /* Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated on a channel */ } else if (!strcasecmp(v->name, "transmit_silence_during_record") || !strcasecmp(v->name, "transmit_silence")) { ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_TRANSMIT_SILENCE); + /* Enable internal timing */ + } else if (!strcasecmp(v->name, "internal_timing")) { + if (!ast_opt_remote) { + fprintf(stderr, + "NOTICE: The internal_timing option is no longer needed.\n" + " It will always be enabled if you have a timing module loaded.\n"); + } } else if (!strcasecmp(v->name, "mindtmfduration")) { if (sscanf(v->value, "%30u", &option_dtmfminduration) != 1) { option_dtmfminduration = AST_MIN_DTMF_DURATION; @@ -3864,6 +3871,11 @@ int main(int argc, char *argv[]) case 'h': show_cli_help(); exit(0); + case 'I': + fprintf(stderr, + "NOTICE: The -I option is no longer needed.\n" + " It will always be enabled if you have a timing module loaded.\n"); + break; case 'i': ast_set_flag(&ast_options, AST_OPT_FLAG_INIT_KEYS); break; -- cgit v1.2.3