[asterisk-commits] rmudgett: trunk r314418 - in /trunk: ./ include/asterisk/frame.h

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Apr 20 11:55:07 2011
New Revision: 314418

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314418
Log:
Merged revisions 314417 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r314417 | rmudgett | 2011-04-20 11:54:02 -0500 (Wed, 20 Apr 2011) | 1 line
  
  AST_CONTROL_XXX comment changes.
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/frame.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/frame.h?view=diff&rev=314418&r1=314417&r2=314418
==============================================================================
--- trunk/include/asterisk/frame.h (original)
+++ trunk/include/asterisk/frame.h Wed Apr 20 11:55:07 2011
@@ -234,34 +234,34 @@
 #define AST_HTML_LINKREJECT	20
 
 enum ast_control_frame_type {
-	AST_CONTROL_HANGUP = 1,		/*!< Other end has hungup */
-	AST_CONTROL_RING = 2,		/*!< Local ring */
-	AST_CONTROL_RINGING = 3,	/*!< Remote end is ringing */
-	AST_CONTROL_ANSWER = 4,		/*!< Remote end has answered */
-	AST_CONTROL_BUSY = 5,		/*!< Remote end is busy */
+	AST_CONTROL_HANGUP = 1,			/*!< Other end has hungup */
+	AST_CONTROL_RING = 2,			/*!< Local ring */
+	AST_CONTROL_RINGING = 3,		/*!< Remote end is ringing */
+	AST_CONTROL_ANSWER = 4,			/*!< Remote end has answered */
+	AST_CONTROL_BUSY = 5,			/*!< Remote end is busy */
 	AST_CONTROL_TAKEOFFHOOK = 6,	/*!< Make it go off hook */
-	AST_CONTROL_OFFHOOK = 7,	/*!< Line is off hook */
-	AST_CONTROL_CONGESTION = 8,	/*!< Congestion (circuits busy) */
-	AST_CONTROL_FLASH = 9,		/*!< Flash hook */
-	AST_CONTROL_WINK = 10,		/*!< Wink */
-	AST_CONTROL_OPTION = 11,	/*!< Set a low-level option */
-	AST_CONTROL_RADIO_KEY = 12,	/*!< Key Radio */
+	AST_CONTROL_OFFHOOK = 7,		/*!< Line is off hook */
+	AST_CONTROL_CONGESTION = 8,		/*!< Congestion (circuits busy) */
+	AST_CONTROL_FLASH = 9,			/*!< Flash hook */
+	AST_CONTROL_WINK = 10,			/*!< Wink */
+	AST_CONTROL_OPTION = 11,		/*!< Set a low-level option */
+	AST_CONTROL_RADIO_KEY = 12,		/*!< Key Radio */
 	AST_CONTROL_RADIO_UNKEY = 13,	/*!< Un-Key Radio */
-	AST_CONTROL_PROGRESS = 14,	/*!< Indicate PROGRESS */
+	AST_CONTROL_PROGRESS = 14,		/*!< Indicate PROGRESS */
 	AST_CONTROL_PROCEEDING = 15,	/*!< Indicate CALL PROCEEDING */
-	AST_CONTROL_HOLD = 16,		/*!< Indicate call is placed on hold */
-	AST_CONTROL_UNHOLD = 17,	/*!< Indicate call is left from hold */
-	AST_CONTROL_VIDUPDATE = 18,	/*!< Indicate video frame update */
-	_XXX_AST_CONTROL_T38 = 19,	/*!< T38 state change request/notification \deprecated This is no longer supported. Use AST_CONTROL_T38_PARAMETERS instead. */
-	AST_CONTROL_SRCUPDATE = 20,     /*!< Indicate source of media has changed */
-	AST_CONTROL_TRANSFER = 21,      /*!< Indicate status of a transfer request */
+	AST_CONTROL_HOLD = 16,			/*!< Indicate call is placed on hold */
+	AST_CONTROL_UNHOLD = 17,		/*!< Indicate call is left from hold */
+	AST_CONTROL_VIDUPDATE = 18,		/*!< Indicate video frame update */
+	_XXX_AST_CONTROL_T38 = 19,		/*!< T38 state change request/notification \deprecated This is no longer supported. Use AST_CONTROL_T38_PARAMETERS instead. */
+	AST_CONTROL_SRCUPDATE = 20,		/*!< Indicate source of media has changed */
+	AST_CONTROL_TRANSFER = 21,		/*!< Indicate status of a transfer request */
 	AST_CONTROL_CONNECTED_LINE = 22,/*!< Indicate connected line has changed */
-	AST_CONTROL_REDIRECTING = 23,    /*!< Indicate redirecting id has changed */
-	AST_CONTROL_T38_PARAMETERS = 24, /*! T38 state change request/notification with parameters */
-	AST_CONTROL_CC = 25, /*!< Indication that Call completion service is possible */
-	AST_CONTROL_SRCCHANGE = 26,  /*!< Media source has changed and requires a new RTP SSRC */
-	AST_CONTROL_READ_ACTION = 27, /*!< Tell ast_read to take a specific action */
-	AST_CONTROL_AOC = 28,           /*!< Advice of Charge with encoded generic AOC payload */
+	AST_CONTROL_REDIRECTING = 23,	/*!< Indicate redirecting id has changed */
+	AST_CONTROL_T38_PARAMETERS = 24,/*!< T38 state change request/notification with parameters */
+	AST_CONTROL_CC = 25,			/*!< Indication that Call completion service is possible */
+	AST_CONTROL_SRCCHANGE = 26,		/*!< Media source has changed and requires a new RTP SSRC */
+	AST_CONTROL_READ_ACTION = 27,	/*!< Tell ast_read to take a specific action */
+	AST_CONTROL_AOC = 28,			/*!< Advice of Charge with encoded generic AOC payload */
 	AST_CONTROL_END_OF_Q = 29,		/*!< Indicate that this position was the end of the channel queue for a softhangup. */
 	AST_CONTROL_MCID = 30,			/*!< Indicate that the caller is being malicious. */
 };