merge new_loader_completion branch, including (at least):

  - restructured build tree and makefiles to eliminate recursion problems
  - support for embedded modules
  - support for static builds
  - simpler cross-compilation support
  - simpler module/loader interface (no exported symbols)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 6 deletions

diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index ed6f6275b..07c0ae1c2 100644
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -101,13 +101,13 @@ struct ast_translator {
 	 */
 	int buf_size;
 
-	int desc_size;		/*!< size of private descriptor in pvt->pvt, if any */
-	int plc_samples;	/*!< set to the plc block size if used, 0 otherwise */
-	int useplc;		/*!< current status of plc, changed at runtime */
+	int desc_size;			/*!< size of private descriptor in pvt->pvt, if any */
+	int plc_samples;		/*!< set to the plc block size if used, 0 otherwise */
+	int useplc;			/*!< current status of plc, changed at runtime */
 
-	void *module;		/*!< opaque reference to the parent module */
+	struct ast_module *module;	/* opaque reference to the parent module */
 
-	int cost;		/*!< Cost in milliseconds for encoding/decoding 1 second of sound */
+	int cost;			/*!< Cost in milliseconds for encoding/decoding 1 second of sound */
 	AST_LIST_ENTRY(ast_translator) list;	/*!< link field */
 };
 
@@ -155,7 +155,8 @@ struct ast_trans_pvt;
  * \param module handle to the module that owns this translator
  * \return 0 on success, -1 on failure
  */
-int ast_register_translator(struct ast_translator *t, void *module);
+int __ast_register_translator(struct ast_translator *t, struct ast_module *module);
+#define ast_register_translator(t) __ast_register_translator(t, ast_module_info->self)
 
 /*!
  * \brief Unregister a translator