diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:21:06 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:21:06 +0000 |
commit | f8e42423ba838f74caab37dc1e0a103542121193 (patch) | |
tree | 31aedf32e9a5f0b693d961b1dcf7733b1e15a799 /codecs/codec_ulaw.c | |
parent | ff37f9e1a548b24c0a83d309352fa56554867435 (diff) |
Merged revisions 267492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r267492 | mmichelson | 2010-06-03 12:09:11 -0500 (Thu, 03 Jun 2010) | 6 lines
Remove unnecessary code relating to PLC.
The logic for handling generic PLC is now handled in ast_write in
channel.c instead of in translation code.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@267507 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_ulaw.c')
-rw-r--r-- | codecs/codec_ulaw.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 4d1c8a1ae..bbc8894a7 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -84,7 +84,6 @@ static struct ast_translator ulawtolin = { .sample = ulaw_sample, .buffer_samples = BUFFER_SAMPLES, .buf_size = BUFFER_SAMPLES * 2, - .plc_samples = 160, }; /*! @@ -101,27 +100,8 @@ static struct ast_translator lintoulaw = { .buffer_samples = BUFFER_SAMPLES, }; -static int parse_config(int reload) -{ - struct ast_variable *var; - struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; - struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); - if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) - return 0; - for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { - if (!strcasecmp(var->name, "genericplc")) { - ulawtolin.useplc = ast_true(var->value) ? 1 : 0; - ast_verb(3, "codec_ulaw: %susing generic PLC\n", ulawtolin.useplc ? "" : "not "); - } - } - ast_config_destroy(cfg); - return 0; -} - static int reload(void) { - if (parse_config(1)) - return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_SUCCESS; } @@ -139,8 +119,6 @@ static int load_module(void) { int res; - if (parse_config(0)) - return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&ulawtolin); if (!res) res = ast_register_translator(&lintoulaw); |