kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

if multiple translators are registered for the same source/dest combination, ensure that the lowest-cost one is always inserted earlier in the list

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-24 23:45:19 +00:00
parent 72a23ce184
commit c5f096e220
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/translate.c
View File

@@ -644,6 +644,7 @@ static struct ast_cli_entry cli_translate[] = {
int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
{
static int added_cli = 0;
struct ast_translator *u;
if (!mod) {
ast_log(LOG_WARNING, "Missing module pointer, you need to supply one\n");
@@ -701,7 +702,24 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
ast_cli_register_multiple(cli_translate, sizeof(cli_translate) / sizeof(struct ast_cli_entry));
added_cli++;
}
AST_LIST_INSERT_HEAD(&translators, t, list);
/* find any existing translators that provide this same srcfmt/dstfmt,
and put this one in order based on cost */
AST_LIST_TRAVERSE_SAFE_BEGIN(&translators, u, list) {
if ((u->srcfmt == t->srcfmt) &&
(u->dstfmt == t->dstfmt) &&
(u->cost > t->cost)) {
AST_LIST_INSERT_BEFORE_CURRENT(&translators, t, list);
t = NULL;
}
}
AST_LIST_TRAVERSE_SAFE_END;
/* if no existing translator was found for this format combination,
add it to the beginning of the list */
if (t)
AST_LIST_INSERT_HEAD(&translators, t, list);
rebuild_matrix(0);
AST_LIST_UNLOCK(&translators);
return 0;
@@ -721,7 +739,7 @@ int ast_unregister_translator(struct ast_translator *t)
break;
}
}
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_TRAVERSE_SAFE_END;
rebuild_matrix(0);
AST_LIST_UNLOCK(&translators);
return (u ? 0 : -1);