[Asterisk-cvs] asterisk/codecs codec_adpcm.c, 1.15, 1.16 codec_alaw.c, 1.8, 1.9 codec_g726.c, 1.7, 1.8 codec_gsm.c, 1.14, 1.15 codec_lpc10.c, 1.12, 1.13 codec_ulaw.c, 1.9, 1.10

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/codecs
In directory mongoose.digium.com:/tmp/cvs-serv31936

Modified Files:
	codec_adpcm.c codec_alaw.c codec_g726.c codec_gsm.c 
	codec_lpc10.c codec_ulaw.c 
Log Message:
show correct codec in verbose messages (bug #4008)


Index: codec_adpcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- codec_adpcm.c	17 Mar 2005 21:30:19 -0000	1.15
+++ codec_adpcm.c	12 Apr 2005 02:41:29 -0000	1.16
@@ -569,7 +569,7 @@
        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;
       }

Index: codec_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_alaw.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- codec_alaw.c	17 Mar 2005 21:30:19 -0000	1.8
+++ codec_alaw.c	12 Apr 2005 02:41:29 -0000	1.9
@@ -359,7 +359,7 @@
        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;
       }

Index: codec_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- codec_g726.c	17 Mar 2005 21:30:19 -0000	1.7
+++ codec_g726.c	12 Apr 2005 02:41:29 -0000	1.8
@@ -1005,7 +1005,7 @@
        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;
       }

Index: codec_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_gsm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- codec_gsm.c	17 Mar 2005 21:30:19 -0000	1.14
+++ codec_gsm.c	12 Apr 2005 02:41:29 -0000	1.15
@@ -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 @@
 			       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;
 			}

Index: codec_lpc10.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- codec_lpc10.c	17 Mar 2005 21:30:19 -0000	1.12
+++ codec_lpc10.c	12 Apr 2005 02:41:29 -0000	1.13
@@ -357,7 +357,7 @@
                                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;
                         }

Index: codec_ulaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_ulaw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- codec_ulaw.c	17 Mar 2005 21:30:19 -0000	1.9
+++ codec_ulaw.c	12 Apr 2005 02:41:29 -0000	1.10
@@ -358,7 +358,7 @@
 	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;
       }