[asterisk-commits] qwell: branch qwell/ari_channel_variables r393488 - in /team/qwell/ari_channe...

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Jul  2 15:48:19 2013
New Revision: 393488

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393488
Log:
Multiple revisions 393484-393485,393487

........
  r393484 | dlee | 2013-07-02 15:34:42 -0500 (Tue, 02 Jul 2013) | 1 line
  
  Add pjproject dependency to res_sip_notify
........
  r393485 | rmudgett | 2013-07-02 15:43:10 -0500 (Tue, 02 Jul 2013) | 1 line
  
  Fix chan_gtalk.c compile error.
........
  r393487 | rmudgett | 2013-07-02 15:45:47 -0500 (Tue, 02 Jul 2013) | 5 lines
  
  Fix MixMonitor b option.
  
  The option had not been converted to use the replacement for
  ast_bridged_channel().  One touch mixmonitor now records files again.
........

Merged revisions 393484-393485,393487 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/qwell/ari_channel_variables/   (props changed)
    team/qwell/ari_channel_variables/apps/app_mixmonitor.c
    team/qwell/ari_channel_variables/channels/chan_gtalk.c
    team/qwell/ari_channel_variables/res/res_sip_notify.c

Propchange: team/qwell/ari_channel_variables/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul  2 15:48:19 2013
@@ -1,1 +1,1 @@
-/trunk:1-393473
+/trunk:1-393487

Modified: team/qwell/ari_channel_variables/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari_channel_variables/apps/app_mixmonitor.c?view=diff&rev=393488&r1=393487&r2=393488
==============================================================================
--- team/qwell/ari_channel_variables/apps/app_mixmonitor.c (original)
+++ team/qwell/ari_channel_variables/apps/app_mixmonitor.c Tue Jul  2 15:48:19 2013
@@ -649,7 +649,9 @@
 		 * Unlock it, but remember to lock it before looping or exiting */
 		ast_audiohook_unlock(&mixmonitor->audiohook);
 
-		if (!ast_test_flag(mixmonitor, MUXFLAG_BRIDGED) || (mixmonitor->autochan->chan && ast_bridged_channel(mixmonitor->autochan->chan))) {
+		if (!ast_test_flag(mixmonitor, MUXFLAG_BRIDGED)
+			|| (mixmonitor->autochan->chan
+				&& ast_channel_is_bridged(mixmonitor->autochan->chan))) {
 			ast_mutex_lock(&mixmonitor->mixmonitor_ds->lock);
 
 			/* Write out the frame(s) */

Modified: team/qwell/ari_channel_variables/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari_channel_variables/channels/chan_gtalk.c?view=diff&rev=393488&r1=393487&r2=393488
==============================================================================
--- team/qwell/ari_channel_variables/channels/chan_gtalk.c (original)
+++ team/qwell/ari_channel_variables/channels/chan_gtalk.c Tue Jul  2 15:48:19 2013
@@ -1214,8 +1214,6 @@
 		ast_channel_hangupcause_set(tmp, AST_CAUSE_SWITCH_CONGESTION);
 		ast_hangup(tmp);
 		tmp = NULL;
-	} else {
-		send_channel_update(i->owner, i->sid);
 	}
 	return tmp;
 }

Modified: team/qwell/ari_channel_variables/res/res_sip_notify.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari_channel_variables/res/res_sip_notify.c?view=diff&rev=393488&r1=393487&r2=393488
==============================================================================
--- team/qwell/ari_channel_variables/res/res_sip_notify.c (original)
+++ team/qwell/ari_channel_variables/res/res_sip_notify.c Tue Jul  2 15:48:19 2013
@@ -17,6 +17,7 @@
  */
 
 /*** MODULEINFO
+	<depend>pjproject</depend>
 	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/