[svn-commits] dvossel: branch dvossel/fixtheworld_phase1_step1 r298329 - in /team/dvossel/f...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Dec 14 10:09:52 2010
New Revision: 298329

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298329
Log:
Fixes a few issues with the Ast Format API function prototypes

Modified:
    team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h
    team/dvossel/fixtheworld_phase1_step1/main/format.c

Modified: team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h?view=diff&rev=298329&r1=298328&r2=298329
==============================================================================
--- team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h (original)
+++ team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h Tue Dec 14 10:09:52 2010
@@ -77,7 +77,7 @@
 	/*! Raw 16-bit Signed Linear (16000 Hz) PCM */
 	AST_FORMAT2_SLINEAR16       = 16 + AST_FORMAT2_TYPE_AUDIO,
 	/*! G.719 (64 kbps assumed) */
-	AST_FORMAT2_G719	           = 17 + AST_FORMAT2_TYPE_AUDIO,
+	AST_FORMAT2_G719	        = 17 + AST_FORMAT2_TYPE_AUDIO,
 	/*! SpeeX Wideband (16kHz) Free Compression */
 	AST_FORMAT2_SPEEX16         = 18 + AST_FORMAT2_TYPE_AUDIO,
 	/*! Raw mu-law data (G.711) */
@@ -116,7 +116,7 @@
 /*! \brief Represents a media format within Asterisk. */
 struct ast_format {
     /*! The unique id representing this format from all the other formats. */
-    enum ast_format_id uid;
+    enum ast_format_id id;
     /*!  Attribute structure used to associate attributes with a format. */
     struct ast_format_attr *fattr;
 };
@@ -187,7 +187,7 @@
  * retval 0, joint attribute capabilities exist.
  * retval -1, no joint attribute capabilities exist.
  */
-int ast_format_joint(struct ast_format *format1, struct ast_format_attr *format2, struct ast_format_attr *result);
+int ast_format_joint(struct ast_format *format1, struct ast_format *format2, struct ast_format *result);
 
 /*! \brief register ast_format_attr_interface with core.
  *

Modified: team/dvossel/fixtheworld_phase1_step1/main/format.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step1/main/format.c?view=diff&rev=298329&r1=298328&r2=298329
==============================================================================
--- team/dvossel/fixtheworld_phase1_step1/main/format.c (original)
+++ team/dvossel/fixtheworld_phase1_step1/main/format.c Tue Dec 14 10:09:52 2010
@@ -46,7 +46,7 @@
 	return 0;
 }
 
-int ast_format_joint(struct ast_format *format1, struct ast_format_attr *format2, struct ast_format_attr *result)
+int ast_format_joint(struct ast_format *format1, struct ast_format *format2, struct ast_format *result)
 {
 	return 0;
 }