show correct codec in verbose messages (bug #4008)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5452 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 7ec1571dacf5ebb167769d52983856306e597d62..027c649269d9b70527af6ec0159d3e0ebb5bb654 100755 (executable)
--- 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 6705dff21e65b7bf1a687f0f435aedebcae39564..1563db3ccad25dab7a05513a321959ac92924b07 100755 (executable)
--- 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 80d978c80f497fffc471905df06bb5f2f325000b..f05ba7694e5892a5a4858509e03e586213c0184f 100755 (executable)
--- 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 30dc2d498e2ffdc8e572da83f4a443a4f2c22039..bc476a8537b6d09513b1feff436ff77949adf42c 100755 (executable)
--- 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 904f0266ad83d48e92e97d99420abdb73613d402..80821d09e4aa36e09c7233aa4f3064a737059a8f 100755 (executable)
--- 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 4f2b24c7d76fac718b553280380ab9cf41a5c237..9dd0e47907aae5fbf1b77200c9f149158b9333a8 100755 (executable)
--- 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;
       }