<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8371">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Joshua Colp: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">func_audiohookinherit: Remove deprecated module.<br><br>Change-Id: Id52f719078a65c4b2eee7ab99d761eba6b6aed94<br>---<br>M CHANGES<br>D funcs/func_audiohookinherit.c<br>2 files changed, 7 insertions(+), 89 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/CHANGES b/CHANGES<br>index 2d49c13..66ffca5 100644<br>--- a/CHANGES<br>+++ b/CHANGES<br>@@ -74,12 +74,19 @@<br> * The res_pjsip_registrar_expire module has been removed. The functionality has<br> been moved into res_pjsip_registrar.<br> <br>+func_audiohookinherit<br>+------------------<br>+ * The func_audiohookinherit module has been removed. Due to architectural changes<br>+ in Asterisk 12, audiohook inheritance is performed automatically and this<br>+ function now lacks function.<br>+<br> cdr_syslog<br> ------------------<br> * The cdr_syslog module is now deprecated and by default it is no longer<br> built.<br> <br> Core:<br>+------------------<br> * libedit is no longer available as an embedded library and must be provided<br> by the system.<br> <br>diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c<br>deleted file mode 100644<br>index 2d79aba..0000000<br>--- a/funcs/func_audiohookinherit.c<br>+++ /dev/null<br>@@ -1,89 +0,0 @@<br>-/*<br>- * Asterisk -- An open source telephony toolkit.<br>- *<br>- * Copyright (C) 2008, Digium, Inc.<br>- *<br>- * Mark Michelson <mmichelson@digium.com><br>- *<br>- * See http://www.asterisk.org for more information about<br>- * the Asterisk project. Please do not directly contact<br>- * any of the maintainers of this project for assistance;<br>- * the project provides a web site, mailing lists and IRC<br>- * channels for your use.<br>- *<br>- * This program is free software, distributed under the terms of<br>- * the GNU General Public License Version 2. See the LICENSE file<br>- * at the top of the source tree.<br>- *<br>- * Please follow coding guidelines<br>- * http://svn.digium.com/view/asterisk/trunk/doc/CODING-GUIDELINES<br>- */<br>-<br>-/*! \file<br>- *<br>- * \brief Audiohook inheritance function<br>- *<br>- * \author Mark Michelson <mmichelson@digium.com><br>- *<br>- * \ingroup functions<br>- */<br>-<br>-/*** MODULEINFO<br>- <support_level>deprecated</support_level><br>- ***/<br>-<br>-#include "asterisk.h"<br>-#include "asterisk/channel.h"<br>-#include "asterisk/logger.h"<br>-#include "asterisk/pbx.h"<br>-#include "asterisk/module.h"<br>-<br>-/*** DOCUMENTATION<br>- <function name = "AUDIOHOOK_INHERIT" language="en_US"><br>- <synopsis><br>- DEPRECATED: Used to set whether an audiohook may be inherited to another<br>- channel. Due to architectural changes in Asterisk 12, audiohook inheritance<br>- is performed automatically and this function now lacks function.<br>- </synopsis><br>- <description><br>- <para>Prior to Asterisk 12, masquerades would occur under all sorts of<br>- situations which were hard to predict. In Asterisk 12, masquerades only<br>- occur as a result of a small set of operations for which inheriting all<br>- audiohooks from the original channel is now safe. So in Asterisk 12.5+,<br>- all audiohooks are inherited without needing other controls expressing<br>- which audiohooks should be inherited under which conditions.</para><br>- </description><br>- </function><br>- ***/<br>-<br>-static int func_inheritance_write(struct ast_channel *chan, const char *function, char *data, const char *value)<br>-{<br>- static int warned = 0;<br>-<br>- if (!warned) {<br>- ast_log(LOG_NOTICE, "AUDIOHOOK_INHERIT is deprecated and now does nothing.\n");<br>- warned++;<br>- }<br>-<br>- return 0;<br>-}<br>-<br>-static struct ast_custom_function inheritance_function = {<br>- .name = "AUDIOHOOK_INHERIT",<br>- .write = func_inheritance_write,<br>-};<br>-<br>-static int unload_module(void)<br>-{<br>- return ast_custom_function_unregister(&inheritance_function);<br>-}<br>-<br>-static int load_module(void)<br>-{<br>- if (ast_custom_function_register(&inheritance_function)) {<br>- return AST_MODULE_LOAD_DECLINE;<br>- } else {<br>- return AST_MODULE_LOAD_SUCCESS;<br>- }<br>-}<br>-AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Audiohook inheritance placeholder function");<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8371">change 8371</a>. To unsubscribe, 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/8371"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id52f719078a65c4b2eee7ab99d761eba6b6aed94 </div>
<div style="display:none"> Gerrit-Change-Number: 8371 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>