[asterisk-commits] jrose: trunk r373479 - in /trunk: ./ apps/ funcs/

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Sep 24 16:19:49 2012
New Revision: 373479

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373479
Log:
func_audiohookinherit: Document some missed sources.

This patch also mentions that AUDIOHOOK_INHERIT can be used to
transfer MixMonitor audiohooks. There is also wiki that addresses
audiohooks and the use of AUDIOHOOK_INHERIT at the following link:
https://wiki.asterisk.org/wiki/display/AST/Audiohooks

(closes issue ASTERISK-18220)
Reported by: Ishfaq Malik
........

Merged revisions 373467 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373468 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373470 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/apps/app_mixmonitor.c
    trunk/funcs/func_audiohookinherit.c

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

Modified: trunk/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=373479&r1=373478&r2=373479
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Mon Sep 24 16:19:49 2012
@@ -132,6 +132,11 @@
 			<para>Records the audio on the current channel to the specified file.</para>
 			<para>This application does not automatically answer and should be preceeded by
 			an application such as Answer or Progress().</para>
+			<note><para>MixMonitor runs as an audiohook. In order to keep it running through
+			a transfer, AUDIOHOOK_INHERIT must be set for the channel which ran mixmonitor.
+			For more information, including dialplan configuration set for using
+			AUDIOHOOK_INHERIT with MixMonitor, see the function documentation for
+			AUDIOHOOK_INHERIT.</para></note>
 			<variablelist>
 				<variable name="MIXMONITOR_FILENAME">
 					<para>Will contain the filename used to record.</para>
@@ -143,6 +148,7 @@
 			<ref type="application">StopMixMonitor</ref>
 			<ref type="application">PauseMonitor</ref>
 			<ref type="application">UnpauseMonitor</ref>
+			<ref type="function">AUDIOHOOK_INHERIT</ref>
 		</see-also>
 	</application>
 	<application name="StopMixMonitor" language="en_US">

Modified: trunk/funcs/func_audiohookinherit.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_audiohookinherit.c?view=diff&rev=373479&r1=373478&r2=373479
==============================================================================
--- trunk/funcs/func_audiohookinherit.c (original)
+++ trunk/funcs/func_audiohookinherit.c Mon Sep 24 16:19:49 2012
@@ -53,7 +53,9 @@
 					<enum name="Chanspy" />
 					<enum name="Volume" />
 					<enum name="Speex" />
+					<enum name="pitch_shift" />
 					<enum name="JACK_HOOK" />
+					<enum name="Mute" />
 				</enumlist>
 				<para>Note that the names are not case-sensitive</para>
 			</parameter>