<p>Juan Carlos Castro y Castro would like Joshua Colp to <strong>review</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15064">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">voicemail: add option 'e' top play greetings as early media<br><br>When using this option, answering the channel is deferred until<br>all prompts/greetings have been played and the caller is about<br>to leave their message.<br><br>ASTERISK-29118 #close<br>Change-Id: I6b8a77d33e338a3e52dd65f998d8a07e4d16aa2e<br><br>Change-Id: I468fd6e5d042df9fad33231947a7bda3e2def3e9<br>---<br>M apps/app_voicemail.c<br>M main/asterisk.c<br>2 files changed, 29 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/64/15064/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index 0b9904c..67562da 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -135,6 +135,10 @@</span><br><span> <para>Accept digits for a new extension in context <replaceable>c</replaceable>,</span><br><span> if played during the greeting. Context defaults to the current context.</para></span><br><span> </option></span><br><span style="color: hsl(120, 100%, 40%);">+ <option name="e"></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>Play greetings as early media -- only answer the channel just</span><br><span style="color: hsl(120, 100%, 40%);">+ before accepting the voice message.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ </option></span><br><span> <option name="g"></span><br><span> <argument name="#" required="true" /></span><br><span> <para>Use the specified amount of gain when recording the voicemail</span><br><span>@@ -627,7 +631,8 @@</span><br><span> OPT_AUTOPLAY = (1 << 6),</span><br><span> OPT_DTMFEXIT = (1 << 7),</span><br><span> OPT_MESSAGE_Urgent = (1 << 8),</span><br><span style="color: hsl(0, 100%, 40%);">- OPT_MESSAGE_PRIORITY = (1 << 9)</span><br><span style="color: hsl(120, 100%, 40%);">+ OPT_MESSAGE_PRIORITY = (1 << 9),</span><br><span style="color: hsl(120, 100%, 40%);">+ OPT_EARLYM_GREETING = (1 << 10)</span><br><span> };</span><br><span> </span><br><span> enum vm_option_args {</span><br><span>@@ -653,7 +658,8 @@</span><br><span> AST_APP_OPTION('p', OPT_PREPEND_MAILBOX),</span><br><span> AST_APP_OPTION_ARG('a', OPT_AUTOPLAY, OPT_ARG_PLAYFOLDER),</span><br><span> AST_APP_OPTION('U', OPT_MESSAGE_Urgent),</span><br><span style="color: hsl(0, 100%, 40%);">- AST_APP_OPTION('P', OPT_MESSAGE_PRIORITY)</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_APP_OPTION('P', OPT_MESSAGE_PRIORITY),</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_APP_OPTION('e', OPT_EARLYM_GREETING)</span><br><span> });</span><br><span> </span><br><span> static const char * const mailbox_folders[] = {</span><br><span>@@ -6905,6 +6911,8 @@</span><br><span> return -1;</span><br><span> }</span><br><span> /* The meat of recording the message... All the announcements and beeps have been played*/</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_channel_state(chan) != AST_STATE_UP)</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_answer(chan);</span><br><span> ast_copy_string(fmt, vmfmts, sizeof(fmt));</span><br><span> if (!ast_strlen_zero(fmt)) {</span><br><span> char msg_id[MSG_ID_LEN] = "";</span><br><span>@@ -12310,9 +12318,6 @@</span><br><span> </span><br><span> memset(&leave_options, 0, sizeof(leave_options));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ast_channel_state(chan) != AST_STATE_UP)</span><br><span style="color: hsl(0, 100%, 40%);">- ast_answer(chan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (!ast_strlen_zero(data)) {</span><br><span> tmp = ast_strdupa(data);</span><br><span> AST_STANDARD_APP_ARGS(args, tmp);</span><br><span>@@ -12345,6 +12350,15 @@</span><br><span> args.argv0 = ast_strdupa(temp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_channel_state(chan) != AST_STATE_UP) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_test_flag(&flags, OPT_EARLYM_GREETING)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_indicate(chan, AST_CONTROL_PROGRESS);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(AST_LOG_WARNING, "Playing greetings as Early Media, deferring answer (EXPERIMENTAL FEATURE)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_answer(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> res = leave_voicemail(chan, args.argv0, &leave_options);</span><br><span> if (res == 't') {</span><br><span> ast_play_and_wait(chan, "vm-goodbye");</span><br><span>diff --git a/main/asterisk.c b/main/asterisk.c</span><br><span>index a028611..94d791b 100644</span><br><span>--- a/main/asterisk.c</span><br><span>+++ b/main/asterisk.c</span><br><span>@@ -307,6 +307,10 @@</span><br><span> "This is free software, with components licensed under the GNU General Public\n" \</span><br><span> "License version 2 and other licenses; you are welcome to redistribute it under\n" \</span><br><span> "certain conditions. Type 'core show license' for details.\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "=========================================================================\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Please note that this version of Asterisk no longer receives bug fixes.\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Consult the following URL for Asterisk version support status information:\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions\n" \</span><br><span> "=========================================================================\n", ast_get_version()) \</span><br><span> </span><br><span> static int ast_socket = -1; /*!< UNIX Socket for allowing remote control */</span><br><span>@@ -4193,6 +4197,12 @@</span><br><span> run_startup_commands();</span><br><span> ast_sd_notify("READY=1");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_RED, 0, "========================================================================="));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_RED, 0, "Please note that this version of Asterisk no longer receives bug fixes."));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_RED, 0, "Consult the following URL for Asterisk version support status information:"));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_RED, 0, "https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions"));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_RED, 0, "========================================================================="));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ast_verb(0, COLORIZE_FMT "\n", COLORIZE(COLOR_BRGREEN, 0, "Asterisk Ready."));</span><br><span> </span><br><span> logger_queue_start();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15064">change 15064</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15064"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I468fd6e5d042df9fad33231947a7bda3e2def3e9 </div>
<div style="display:none"> Gerrit-Change-Number: 15064 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Juan Carlos Castro y Castro <jccyc1965@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>