[asterisk-commits] kmoore: branch kmoore/stasis-bridge_events r385299 - in /team/kmoore/stasis-b...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 11 07:53:14 CDT 2013
Author: kmoore
Date: Thu Apr 11 07:53:09 2013
New Revision: 385299
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385299
Log:
Revert to EVENT_FLAG_CALL. EVENT_FLAG_BRIDGE is not useful
Modified:
team/kmoore/stasis-bridge_events/include/asterisk/manager.h
team/kmoore/stasis-bridge_events/main/manager.c
team/kmoore/stasis-bridge_events/main/manager_bridging.c
Modified: team/kmoore/stasis-bridge_events/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/include/asterisk/manager.h?view=diff&rev=385299&r1=385298&r2=385299
==============================================================================
--- team/kmoore/stasis-bridge_events/include/asterisk/manager.h (original)
+++ team/kmoore/stasis-bridge_events/include/asterisk/manager.h Thu Apr 11 07:53:09 2013
@@ -86,7 +86,6 @@
#define EVENT_FLAG_CC (1 << 15) /* Call Completion events */
#define EVENT_FLAG_AOC (1 << 16) /* Advice Of Charge events */
#define EVENT_FLAG_TEST (1 << 17) /* Test event used to signal the Asterisk Test Suite */
-#define EVENT_FLAG_BRIDGE (1 << 18) /* Bridge events */
/*XXX Why shifted by 30? XXX */
#define EVENT_FLAG_MESSAGE (1 << 30) /* MESSAGE events. */
/*@} */
Modified: team/kmoore/stasis-bridge_events/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/main/manager.c?view=diff&rev=385299&r1=385298&r2=385299
==============================================================================
--- team/kmoore/stasis-bridge_events/main/manager.c (original)
+++ team/kmoore/stasis-bridge_events/main/manager.c Thu Apr 11 07:53:09 2013
@@ -1335,7 +1335,6 @@
{ EVENT_FLAG_AOC, "aoc" },
{ EVENT_FLAG_TEST, "test" },
{ EVENT_FLAG_MESSAGE, "message" },
- { EVENT_FLAG_BRIDGE, "bridge" },
{ INT_MAX, "all" },
{ 0, "none" },
};
Modified: team/kmoore/stasis-bridge_events/main/manager_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/main/manager_bridging.c?view=diff&rev=385299&r1=385298&r2=385299
==============================================================================
--- team/kmoore/stasis-bridge_events/main/manager_bridging.c (original)
+++ team/kmoore/stasis-bridge_events/main/manager_bridging.c Thu Apr 11 07:53:09 2013
@@ -35,7 +35,7 @@
/*** DOCUMENTATION
<managerEvent language="en_US" name="BridgeCreate">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when a bridge is created.</synopsis>
<syntax>
<parameter name="BridgeUniqueid">
@@ -47,7 +47,7 @@
</managerEventInstance>
</managerEvent>
<managerEvent language="en_US" name="BridgeDestroy">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when a bridge is destroyed.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" />
@@ -55,7 +55,7 @@
</managerEventInstance>
</managerEvent>
<managerEvent language="en_US" name="BridgeEnter">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when a channel enters a bridge.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" />
@@ -66,7 +66,7 @@
</managerEventInstance>
</managerEvent>
<managerEvent language="en_US" name="BridgeLeave">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when a channel leaves a bridge.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" />
@@ -77,7 +77,7 @@
</managerEventInstance>
</managerEvent>
<managerEvent language="en_US" name="BridgeVideoSourceChange">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when the video source for a bridge changes.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" />
@@ -88,7 +88,7 @@
</managerEventInstance>
</managerEvent>
<managerEvent language="en_US" name="BridgeVideoModeChange">
- <managerEventInstance class="EVENT_FLAG_BRIDGE">
+ <managerEventInstance class="EVENT_FLAG_CALL">
<synopsis>Raised when the video mode for a bridge changes.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" />
@@ -179,7 +179,7 @@
}
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeCreate", NO_EXTRA_FIELDS);
+ EVENT_FLAG_CALL, "BridgeCreate", NO_EXTRA_FIELDS);
}
/*! \brief Handle bridge destruction */
@@ -192,7 +192,7 @@
}
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeDestroy", NO_EXTRA_FIELDS);
+ EVENT_FLAG_CALL, "BridgeDestroy", NO_EXTRA_FIELDS);
}
static int find_diff(void *uniqueid, void *arg, void *data, int flags)
@@ -229,7 +229,7 @@
if (new_diff) {
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeEnter",
+ EVENT_FLAG_CALL, "BridgeEnter",
"Uniqueid: %s\r\n", new_diff);
}
@@ -238,7 +238,7 @@
if (old_diff) {
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeLeave",
+ EVENT_FLAG_CALL, "BridgeLeave",
"Uniqueid: %s\r\n", old_diff);
}
@@ -259,7 +259,7 @@
}
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeVideoSourceChange",
+ EVENT_FLAG_CALL, "BridgeVideoSourceChange",
"Uniqueid: %s\r\n", new_snapshot->video_source);
}
@@ -290,7 +290,7 @@
}
return ast_manager_snapshot_event_create(
- EVENT_FLAG_BRIDGE, "BridgeVideoModeChange",
+ EVENT_FLAG_CALL, "BridgeVideoModeChange",
"BridgeVideoMode: %s\r\n", video_mode_to_str(new_snapshot->video_mode));
}
@@ -373,7 +373,7 @@
</syntax>
</managerEventInstance>
***/
- manager_event(EVENT_FLAG_BRIDGE, "BridgeMerge",
+ manager_event(EVENT_FLAG_CALL, "BridgeMerge",
"%s"
"%s",
ast_str_buffer(to_text),
More information about the asterisk-commits
mailing list