From 7b5e73c7a84d1feab62dff8d2c30bd50cde6087e Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 12 Apr 2005 02:41:29 +0000
Subject: [PATCH] show correct codec in verbose messages (bug #4008)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 codecs/codec_adpcm.c | 2 +-
 codecs/codec_alaw.c  | 2 +-
 codecs/codec_g726.c  | 2 +-
 codecs/codec_gsm.c   | 7 +------
 codecs/codec_lpc10.c | 2 +-
 codecs/codec_ulaw.c  | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 7ec1571dac..027c649269 100755
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -569,7 +569,7 @@ parse_config(void)
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_adpcm: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 6705dff21e..1563db3cca 100755
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -359,7 +359,7 @@ parse_config(void)
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_alaw: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 80d978c80f..f05ba7694e 100755
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -1005,7 +1005,7 @@ parse_config(void)
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_g726: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 30dc2d498e..bc476a8537 100755
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -14,11 +14,6 @@
  * the GNU General Public License
  */
 
-#define TYPE_SILENCE	 0x2
-#define TYPE_HIGH	 0x0
-#define TYPE_LOW	 0x1
-#define TYPE_MASK	 0x3
-
 #include <asterisk/lock.h>
 #include <asterisk/translate.h>
 #include <asterisk/config.h>
@@ -282,7 +277,7 @@ static void parse_config(void)
 			       if (!strcasecmp(var->name, "genericplc")) {
 				       useplc = ast_true(var->value) ? 1 : 0;
 				       if (option_verbose > 2)
-					       ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+					       ast_verbose(VERBOSE_PREFIX_3 "codec_gsm: %susing generic PLC\n", useplc ? "" : "not ");
 			       }
 			       var = var->next;
 			}
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 904f0266ad..80821d09e4 100755
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -357,7 +357,7 @@ static void parse_config(void)
                                if (!strcasecmp(var->name, "genericplc")) {
                                        useplc = ast_true(var->value) ? 1 : 0;
                                        if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+                                               ast_verbose(VERBOSE_PREFIX_3 "codec_lpc10: %susing generic PLC\n", useplc ? "" : "not ");
                                }
                                var = var->next;
                         }
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 4f2b24c7d7..9dd0e47907 100755
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -358,7 +358,7 @@ parse_config(void)
 	if (!strcasecmp(var->name, "genericplc")) {
 	  useplc = ast_true(var->value) ? 1 : 0;
 	  if (option_verbose > 2)
-	    ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+	    ast_verbose(VERBOSE_PREFIX_3 "codec_ulaw: %susing generic PLC\n", useplc ? "" : "not ");
 	}
 	var = var->next;
       }
-- 
GitLab