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

1 files changed, 0 insertions, 22 deletions

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index d43ed44d0..a1b0680a5 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -293,7 +293,6 @@ static struct ast_translator adpcmtolin = {
 	.desc_size = sizeof(struct adpcm_decoder_pvt),
 	.buffer_samples = BUFFER_SAMPLES,
 	.buf_size = BUFFER_SAMPLES * 2,
-	.plc_samples = 160,
 };
 
 static struct ast_translator lintoadpcm = {
@@ -308,28 +307,9 @@ static struct ast_translator lintoadpcm = {
 	.buf_size = BUFFER_SAMPLES/ 2,	/* 2 samples per byte */
 };
 
-static int parse_config(int reload)
-{
-	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
-	struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
-	struct ast_variable *var;
-	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")) {
-			adpcmtolin.useplc = ast_true(var->value) ? 1 : 0;
-			ast_verb(3, "codec_adpcm: %susing generic PLC\n", adpcmtolin.useplc ? "" : "not ");
-		}
-	}
-	ast_config_destroy(cfg);
-	return 0;
-}
-
 /*! \brief standard module glue */
 static int reload(void)
 {
-	if (parse_config(1))
-		return AST_MODULE_LOAD_DECLINE;
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
@@ -347,8 +327,6 @@ static int load_module(void)
 {
 	int res;
 
-	if (parse_config(0))
-		return AST_MODULE_LOAD_DECLINE;
 	res = ast_register_translator(&adpcmtolin);
 	if (!res)
 		res = ast_register_translator(&lintoadpcm);