[asterisk-commits] kmoore: branch kmoore/microfilm r397149 - in /team/kmoore/microfilm: include/...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Aug 20 11:28:23 2013
New Revision: 397149

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397149
Log:
BRIDGE_START and BRIDGE_END are no longer useful

Modified:
    team/kmoore/microfilm/include/asterisk/cel.h
    team/kmoore/microfilm/main/cel.c
    team/kmoore/microfilm/tests/test_cel.c

Modified: team/kmoore/microfilm/include/asterisk/cel.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/microfilm/include/asterisk/cel.h?view=diff&rev=397149&r1=397148&r2=397149
==============================================================================
--- team/kmoore/microfilm/include/asterisk/cel.h (original)
+++ team/kmoore/microfilm/include/asterisk/cel.h Tue Aug 20 11:28:23 2013
@@ -51,32 +51,28 @@
 	AST_CEL_APP_START = 5,
 	/*! \brief an app ends */
 	AST_CEL_APP_END = 6,
-	/*! \brief a bridge is established */
-	AST_CEL_BRIDGE_START = 7,
-	/*! \brief a bridge is torn down */
-	AST_CEL_BRIDGE_END = 8,
 	/*! \brief channel enters a bridge */
-	AST_CEL_BRIDGE_ENTER = 9,
+	AST_CEL_BRIDGE_ENTER = 7,
 	/*! \brief channel exits a bridge */
-	AST_CEL_BRIDGE_EXIT = 10,
+	AST_CEL_BRIDGE_EXIT = 8,
 	/*! \brief a channel is parked */
-	AST_CEL_PARK_START = 11,
+	AST_CEL_PARK_START = 9,
 	/*! \brief channel out of the park */
-	AST_CEL_PARK_END = 12,
+	AST_CEL_PARK_END = 10,
 	/*! \brief a transfer occurs */
-	AST_CEL_BLINDTRANSFER = 13,
+	AST_CEL_BLINDTRANSFER = 11,
 	/*! \brief a transfer occurs */
-	AST_CEL_ATTENDEDTRANSFER = 14,
+	AST_CEL_ATTENDEDTRANSFER = 12,
 	/*! \brief a user-defined event, the event name field should be set  */
-	AST_CEL_USER_DEFINED = 15,
+	AST_CEL_USER_DEFINED = 13,
 	/*! \brief the last channel with the given linkedid is retired  */
-	AST_CEL_LINKEDID_END = 16,
+	AST_CEL_LINKEDID_END = 14,
 	/*! \brief a directed pickup was performed on this channel  */
-	AST_CEL_PICKUP = 17,
+	AST_CEL_PICKUP = 15,
 	/*! \brief this call was forwarded somewhere else  */
-	AST_CEL_FORWARD = 18,
+	AST_CEL_FORWARD = 16,
 	/*! \brief A local channel optimization occurred */
-	AST_CEL_LOCAL_OPTIMIZE = 19,
+	AST_CEL_LOCAL_OPTIMIZE = 17,
 };
 
 /*! 

Modified: team/kmoore/microfilm/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/microfilm/main/cel.c?view=diff&rev=397149&r1=397148&r2=397149
==============================================================================
--- team/kmoore/microfilm/main/cel.c (original)
+++ team/kmoore/microfilm/main/cel.c Tue Aug 20 11:28:23 2013
@@ -21,10 +21,6 @@
  *
  * \author Steve Murphy <murf at digium.com>
  * \author Russell Bryant <russell at digium.com>
- *
- * \todo Do thorough testing of all transfer methods to ensure that BLINDTRANSFER,
- *       ATTENDEDTRANSFER, BRIDGE_START, and BRIDGE_END events are all reported
- *       as expected.
  */
 
 /*! \li \ref cel.c uses the configuration file \ref cel.conf
@@ -96,8 +92,6 @@
 						<enum name="HANGUP"/>
 						<enum name="APP_START"/>
 						<enum name="APP_END"/>
-						<enum name="BRIDGE_START"/>
-						<enum name="BRIDGE_END"/>
 						<enum name="PARK_START"/>
 						<enum name="PARK_END"/>
 						<enum name="USER_DEFINED"/>
@@ -296,8 +290,6 @@
 	[AST_CEL_HANGUP]           = "HANGUP",
 	[AST_CEL_APP_START]        = "APP_START",
 	[AST_CEL_APP_END]          = "APP_END",
-	[AST_CEL_BRIDGE_START]     = "BRIDGE_START",
-	[AST_CEL_BRIDGE_END]       = "BRIDGE_END",
 	[AST_CEL_PARK_START]       = "PARK_START",
 	[AST_CEL_PARK_END]         = "PARK_END",
 	[AST_CEL_USER_DEFINED]     = "USER_DEFINED",

Modified: team/kmoore/microfilm/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/microfilm/tests/test_cel.c?view=diff&rev=397149&r1=397148&r2=397149
==============================================================================
--- team/kmoore/microfilm/tests/test_cel.c (original)
+++ team/kmoore/microfilm/tests/test_cel.c Tue Aug 20 11:28:23 2013
@@ -1897,8 +1897,6 @@
 	cel_test_config->events |= 1<<AST_CEL_CHANNEL_END;
 	cel_test_config->events |= 1<<AST_CEL_ANSWER;
 	cel_test_config->events |= 1<<AST_CEL_HANGUP;
-	cel_test_config->events |= 1<<AST_CEL_BRIDGE_START;
-	cel_test_config->events |= 1<<AST_CEL_BRIDGE_END;
 	cel_test_config->events |= 1<<AST_CEL_BRIDGE_ENTER;
 	cel_test_config->events |= 1<<AST_CEL_BRIDGE_EXIT;
 	cel_test_config->events |= 1<<AST_CEL_BLINDTRANSFER;