From 67ba890a5d11585e73c92c75035ea922be44a42c Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 8 Apr 2014 21:20:09 +0000
Subject: [PATCH] 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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@411974 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 fdbcef7e73..e99a98a486 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3400,6 +3400,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;
@@ -3725,6 +3732,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;
--
GitLab