[svn-commits] seanbright: trunk r355624 - in /trunk: ./ main/audiohook.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu Feb 16 14:03:40 2012
New Revision: 355624

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=355624
Log:
Revert a change to audio_audiohook_write_list that had no affect.

When I made this change initially, I was under the false impression that the
audiohooks structure remained on the channel after all of the hooks had been
detached.  This is not the case, ast ast_read takes care of removing the
audiohooks structure if the lists are empty.
........

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

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

Modified:
    trunk/   (props changed)
    trunk/main/audiohook.c

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

Modified: trunk/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/audiohook.c?view=diff&rev=355624&r1=355623&r2=355624
==============================================================================
--- trunk/main/audiohook.c (original)
+++ trunk/main/audiohook.c Thu Feb 16 14:03:40 2012
@@ -783,10 +783,6 @@
 	int middle_frame_manipulated = 0;
 	int removed = 0;
 
-	/* Don't translate our frame if we aren't going to bother to use it */
-	if (ast_audiohook_write_list_empty(audiohook_list))
-		return end_frame;
-
 	/* ---Part_1. translate start_frame to SLINEAR if necessary. */
 	if (!(middle_frame = audiohook_list_translate_to_slin(audiohook_list, direction, start_frame))) {
 		return frame;