[asterisk-commits] seanbright: trunk r349291 - in /trunk: ./ main/audiohook.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Dec 28 15:39:12 2011
New Revision: 349291

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=349291
Log:
Use ast_audiohook_write_list_empty to determine if our lists are empty instead
of duplicating that logic.
........

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

Merged revisions 349290 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=349291&r1=349290&r2=349291
==============================================================================
--- trunk/main/audiohook.c (original)
+++ trunk/main/audiohook.c Wed Dec 28 15:39:12 2011
@@ -784,9 +784,7 @@
 	int removed = 0;
 
 	/* Don't translate our frame if we aren't going to bother to use it */
-	if (AST_LIST_EMPTY(&audiohook_list->spy_list)
-		&& AST_LIST_EMPTY(&audiohook_list->whisper_list)
-		&& AST_LIST_EMPTY(&audiohook_list->manipulate_list))
+	if (ast_audiohook_write_list_empty(audiohook_list))
 		return end_frame;
 
 	/* ---Part_1. translate start_frame to SLINEAR if necessary. */