Commit Graph

4 Commits

Author SHA1 Message Date
David Vossel
d8cf07c8fb Merged revisions 229670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229670 | dvossel | 2009-11-12 10:44:39 -0600 (Thu, 12 Nov 2009) | 12 lines
  
  Merged revisions 229669 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines
    
    fixes merging error, datastore was being freed in the wrong function.
    
    (closes issue #16219)
    Reported by: aragon
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-12 16:48:46 +00:00
David Vossel
b1f76a6aee Merged revisions 228268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r228268 | dvossel | 2009-11-06 09:04:24 -0600 (Fri, 06 Nov 2009) | 9 lines
  
  fixes memory leak in func_audiohookinherit.c
  
  (closes issue #15394)
  Reported by: boroda
  Patches:
        bug15394_memoryleak_diff2.txt uploaded by dbrooks (license 790)
  Tested by: dbrooks, boroda
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@228270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-06 15:05:47 +00:00
Mark Michelson
4bb7e35704 Switch documentation formats for func_audiohookinherit.c
1.6.1 does not have xml documentation, so I reverted
to the old way here.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@166161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:43:35 +00:00
Mark Michelson
7ed70a7a3f Merged revisions 166092,166095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166092 | mmichelson | 2008-12-19 16:26:16 -0600 (Fri, 19 Dec 2008) | 28 lines

Adding a new dialplan function AUDIOHOOK_INHERIT

This function is being added as a method to allow for
an audiohook to move to a new channel during a channel
masquerade. The most obvious use for such a facility is
for MixMonitor when a transfer is performed. Prior to
the addition of this functionality, if a channel 
running MixMonitor was transferred by another party, then
the recording would stop once the transfer had completed.
By using AUDIOHOOK_INHERIT, you can make MixMonitor 
continue recording the call even after the transfer
has completed.

It has also been determined that since this is seen
by most as a bug fix and is not an invasive change,
this functionality will also be backported to 1.4 and
merged into the 1.6.0 branches, even though they are
feature-frozen.

(closes issue #13538)
Reported by: mbit
Patches:
      13538.patch uploaded by putnopvut (license 60)
	  Tested by: putnopvut

Review: http://reviewboard.digium.com/r/102/


........
r166095 | mmichelson | 2008-12-19 16:40:57 -0600 (Fri, 19 Dec 2008) | 5 lines

Remove the verbatim tag from the author line

I could have sworn I already did that before, though...


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@166098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:07:33 +00:00