[svn-commits] rmudgett: branch rmudgett/native_dahdi r394827 - /team/rmudgett/native_dahdi/...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jul 19 17:56:36 2013
New Revision: 394827

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394827
Log:
Make use of ast_channel_has_audio_frame_or_monitor() in native_dahdi bridge tech.

Modified:
    team/rmudgett/native_dahdi/channels/dahdi/bridge_native_dahdi.c

Modified: team/rmudgett/native_dahdi/channels/dahdi/bridge_native_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/native_dahdi/channels/dahdi/bridge_native_dahdi.c?view=diff&rev=394827&r1=394826&r2=394827
==============================================================================
--- team/rmudgett/native_dahdi/channels/dahdi/bridge_native_dahdi.c (original)
+++ team/rmudgett/native_dahdi/channels/dahdi/bridge_native_dahdi.c Fri Jul 19 17:56:36 2013
@@ -45,7 +45,6 @@
 #include "asterisk/bridging.h"
 #include "asterisk/bridging_technology.h"
 #include "asterisk/frame.h"
-#include "asterisk/audiohook.h"
 
 /* ------------------------------------------------------------------- */
 
@@ -663,10 +662,7 @@
 		ast_channel_unlock(chan);
 		return 0;
 	}
-	if (ast_channel_monitor(chan)
-		|| (ast_channel_audiohooks(chan)
-			&& !ast_audiohook_write_list_empty(ast_channel_audiohooks(chan)))
-		|| !ast_framehook_list_contains_no_active(ast_channel_framehooks(chan))) {
+	if (ast_channel_has_audio_frame_or_monitor(chan)) {
 		ast_debug(2, "Channel '%s' has an active monitor, audiohook, or framehook.\n",
 			ast_channel_name(chan));
 		ast_channel_unlock(chan);