[svn-commits] file: branch file/bridge_unreal r410302 - /team/file/bridge_unreal/bridges/

[SVN commits to the Digium repositories]

Author: file
Date: Sat Mar  8 12:47:08 2014
New Revision: 410302

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410302
Log:
Obey the law: If optimizations are disabled don't do them.

Modified:
    team/file/bridge_unreal/bridges/bridge_unreal.c

Modified: team/file/bridge_unreal/bridges/bridge_unreal.c
URL: http://svnview.digium.com/svn/asterisk/team/file/bridge_unreal/bridges/bridge_unreal.c?view=diff&rev=410302&r1=410301&r2=410302
==============================================================================
--- team/file/bridge_unreal/bridges/bridge_unreal.c (original)
+++ team/file/bridge_unreal/bridges/bridge_unreal.c Sat Mar  8 12:47:08 2014
@@ -57,6 +57,7 @@
  */
 static int native_bridge_is_capable(struct ast_bridge_channel *bridge_channel)
 {
+	struct ast_unreal_pvt *pvt = ast_channel_tech_pvt(bridge_channel->chan);
 	struct ast_channel *chan = bridge_channel->chan;
 
 	ast_channel_lock(chan);
@@ -69,6 +70,13 @@
 
 	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);
+		return 0;
+	}
+
+	if (ast_test_flag(pvt, AST_UNREAL_NO_OPTIMIZATION)) {
+		ast_debug(2, "Channel '%s' has explicitly disabled optimization.\n",
 			ast_channel_name(chan));
 		ast_channel_unlock(chan);
 		return 0;