change names to protect the innocent

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8263 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/include/switch_module_interfaces.h

@@ -63,17 +63,17 @@ struct switch_state_handler_table {
 	/*! executed when the state changes to init */
 	switch_state_handler_t on_init;
 	/*! executed when the state changes to ring */
-	switch_state_handler_t on_ring;
+	switch_state_handler_t on_routing;
 	/*! executed when the state changes to execute */
 	switch_state_handler_t on_execute;
 	/*! executed when the state changes to hangup */
 	switch_state_handler_t on_hangup;
 	/*! executed when the state changes to loopback */
-	switch_state_handler_t on_loopback;
+	switch_state_handler_t on_exchange_media;
 	/*! executed when the state changes to transmit */
-	switch_state_handler_t on_transmit;
+	switch_state_handler_t on_soft_execute;
 	/*! executed when the state changes to hold */
-	switch_state_handler_t on_hold;
+	switch_state_handler_t on_consume_media;
 	/*! executed when the state changes to hibernate */
 	switch_state_handler_t on_hibernate;
 	/*! executed when the state changes to reset */

src/include/switch_types.h

@@ -628,16 +628,16 @@ typedef enum {
 
 /*!
   \enum switch_channel_state_t
-  \brief Channel States
+  \brief Channel States (these are the defaults, CS_SOFT_EXECUTE, CS_EXCHANGE_MEDIA, and CS_CONSUME_MEDIA are often overridden by specific apps)
 <pre>
 CS_NEW       - Channel is newly created 
 CS_INIT      - Channel has been initilized
-CS_RING      - Channel is looking for a dialplan
-CS_TRANSMIT  - Channel is in a passive transmit state
+CS_ROUTING   - Channel is looking for an extension to execute
+CS_SOFT_EXECUTE  - Channel is ready to execute from 3rd party control
 CS_EXECUTE   - Channel is executing it's dialplan 
-CS_LOOPBACK  - Channel is in loopback
-CS_PARK      - Channel is parked
-CS_HOLD		 - Channel is on hold
+CS_EXCHANGE_MEDIA  - Channel is exchanging media with another channel.
+CS_PARK      - Channel is accepting media awaiting commands.
+CS_CONSUME_MEDIA		 - Channel is consuming all media and dropping it.
 CS_HIBERNATE - Channel is in a sleep state
 CS_RESET 	 - Channel is in a reset state
 CS_HANGUP    - Channel is flagged for hangup and ready to end
@@ -647,12 +647,12 @@ CS_DONE      - Channel is ready to be destroyed and out of the state machine
 typedef enum {
 	CS_NEW,
 	CS_INIT,
-	CS_RING,
-	CS_TRANSMIT,
+	CS_ROUTING,
+	CS_SOFT_EXECUTE,
 	CS_EXECUTE,
-	CS_LOOPBACK,
+	CS_EXCHANGE_MEDIA,
 	CS_PARK,
-	CS_HOLD,
+	CS_CONSUME_MEDIA,
 	CS_HIBERNATE,
 	CS_RESET,
 	CS_HANGUP,