dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Clean up something I did for ABI compatability in 1.4 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98945 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2008-01-15 23:35:29 +00:00
parent b61a98675c
commit f3a4d7c8f4
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/asterisk/translate.h
View File

@ -138,13 +138,7 @@ struct ast_trans_pvt {
struct ast_translator *t;
struct ast_frame f; /*!< used in frameout */
int samples; /*!< samples available in outbuf */
/*!
* \brief actual space used in outbuf
*
* Also, for the sake of ABI compatability, a magic value of -1 in this
* field means that the pvt has been requested to be destroyed, but is
* pending destruction until ast_translate_frame_freed() gets called.
*/
/*! \brief actual space used in outbuf */
int datalen;
void *pvt; /*!< more private data, if any */
char *outbuf; /*!< the useful portion of the buffer */
@ -152,6 +146,7 @@ struct ast_trans_pvt {
struct ast_trans_pvt *next; /*!< next in translator chain */
struct timeval nextin;
struct timeval nextout;
unsigned int destroy:1;
};
/*! \brief generic frameout function */

5
main/translate.c
View File

@ -139,8 +139,7 @@ static void destroy(struct ast_trans_pvt *pvt)
* When ast_frfree() gets called on that frame, this ast_trans_pvt
* will get destroyed, too. */
/* Set the magic hint that this has been requested to be destroyed. */
pvt->datalen = -1;
pvt->destroy = 1;
return;
}
@ -898,7 +897,7 @@ void ast_translate_frame_freed(struct ast_frame *fr)
pvt = (struct ast_trans_pvt *) (((char *) fr) - offsetof(struct ast_trans_pvt, f));
if (pvt->datalen != -1)
if (!pvt->destroy)
return;
destroy(pvt);