[svn-commits] rmudgett: branch rmudgett/bridge_tasks r389423 - in /team/rmudgett/bridge_tas...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue May 21 14:54:14 2013
New Revision: 389423

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389423
Log:
Fix automerge conflict and restart.

Multiple revisions 389403,389405

........
  r389403 | rmudgett | 2013-05-21 13:50:54 -0500 (Tue, 21 May 2013) | 1 line

  Complete reversion of a backed out change.
........
  r389405 | root | 2013-05-21 14:17:20 -0500 (Tue, 21 May 2013) | 14 lines

  Raise the ConfBridgeMute/Unmute events when a CLI or AMI action triggers the change

  New in 12 are the ConfBridgeMute/Unmute events, which are triggered when a user
  changes their mute/unmute state. This was typically triggered when a user hit a
  DTMF key that triggered the mute/unmute menu handler. Forgotten in this is when an
  AMI action or CLI command triggers the mute/unmute. This patch now raises the
  events in those situations as well.

  (closes issue ASTERISK_21802)
  Reported by: Birger "WIMPy" Harzenetter
  ........

  Merged revisions 389402 from file:///srv/subversion/repos/asterisk/trunk
........

Merged revisions 389403,389405 from file:///srv/subversion/repos/asterisk/team/group/bridge_construction
........

Merged revisions 389418 from http://svn.asterisk.org/svn/asterisk/team/rmudgett/bridge_phase

Modified:
    team/rmudgett/bridge_tasks/   (props changed)
    team/rmudgett/bridge_tasks/apps/app_confbridge.c
    team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c
    team/rmudgett/bridge_tasks/include/asterisk/strings.h

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_construction-integrated (original)
+++ bridge_construction-integrated Tue May 21 14:54:14 2013
@@ -1,1 +1,1 @@
-/trunk:1-389378
+/trunk:1-389404

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_phase-integrated (original)
+++ bridge_phase-integrated Tue May 21 14:54:14 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-389393
+/team/group/bridge_construction:1-389417

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_tasks-integrated (original)
+++ bridge_tasks-integrated Tue May 21 14:54:14 2013
@@ -1,1 +1,1 @@
-/team/rmudgett/bridge_phase:1-389394
+/team/rmudgett/bridge_phase:1-389422

Modified: team/rmudgett/bridge_tasks/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/apps/app_confbridge.c?view=diff&rev=389423&r1=389422&r2=389423
==============================================================================
--- team/rmudgett/bridge_tasks/apps/app_confbridge.c (original)
+++ team/rmudgett/bridge_tasks/apps/app_confbridge.c Tue May 21 14:54:14 2013
@@ -1751,7 +1751,6 @@
 	if (!ast_test_flag(&user->u_profile, USER_OPT_WAITMARKED) || conference->markedusers) {
 		mute = !mute;
 		ast_bridge_mute_set(conference->bridge, user->chan, mute);
-		ast_test_suite_event_notify("CONF_MUTE", "Message: participant %s %s\r\nConference: %s\r\nChannel: %s", ast_channel_name(chan), mute ? "muted" : "unmuted", user->b_profile.name, ast_channel_name(chan));
 		if (mute) {
 			send_mute_event(chan, conference);
 		} else {
@@ -2339,8 +2338,16 @@
 		}
 	}
 	if (user) {
-		ast_bridge_mute_set(conference->bridge, user->chan, mute);
-		ast_test_suite_event_notify("CONF_MUTE", "Message: participant %s %s\r\nConference: %s\r\nChannel: %s", ast_channel_name(user->chan), mute ? "muted" : "unmuted", conference->b_profile.name, ast_channel_name(user->chan));
+		res = ast_bridge_mute_set(conference->bridge, user->chan, mute);
+		if (!res) {
+			ast_channel_lock(user->chan);
+			if (mute) {
+				send_mute_event(user->chan, conference);
+			} else {
+				send_unmute_event(user->chan, conference);
+			}
+			ast_channel_unlock(user->chan);
+		}
 	} else {
 		res = -2;;
 	}

Modified: team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c?view=diff&rev=389423&r1=389422&r2=389423
==============================================================================
--- team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c (original)
+++ team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c Tue May 21 14:54:14 2013
@@ -161,7 +161,6 @@
 			</see-also>
 		</managerEventInstance>
 	</managerEvent>
-
 	<managerEvent language="en_US" name="ConfbridgeTalking">
 		<managerEventInstance class="EVENT_FLAG_CALL">
 			<synopsis>Raised when a confbridge participant unmutes.</synopsis>

Modified: team/rmudgett/bridge_tasks/include/asterisk/strings.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/include/asterisk/strings.h?view=diff&rev=389423&r1=389422&r2=389423
==============================================================================
--- team/rmudgett/bridge_tasks/include/asterisk/strings.h (original)
+++ team/rmudgett/bridge_tasks/include/asterisk/strings.h Tue May 21 14:54:14 2013
@@ -29,7 +29,6 @@
 
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
-#include "asterisk/astobj2.h"
 
 #if defined(DEBUG_OPAQUE)
 #define __AST_STR_USED used2
@@ -1068,5 +1067,4 @@
 	return abs(hash);
 }
 
-
 #endif /* _ASTERISK_STRINGS_H */