[Asterisk-cvs] asterisk/formats format_g723.c,1.11,1.11.2.1 format_wav_gsm.c,1.16,1.16.2.1

[citats at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	format_g723.c format_wav_gsm.c 
Log Message:
Bug #1087.  Fix wav49 format so it can be played.  Make file functions
looking for extension use f->exts instead of f->name.  Fix bug
where error message didn't print file extension. Fix comments in header file.
Everything is completely backwards compatible


Index: format_g723.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g723.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- format_g723.c	13 Aug 2003 15:25:16 -0000	1.11
+++ format_g723.c	25 Feb 2004 22:33:49 -0000	1.11.2.1
@@ -47,7 +47,7 @@
 
 static char *name = "g723sf";
 static char *desc = "G.723.1 Simple Timestamp File Format";
-static char *exts = "g723";
+static char *exts = "g723|g723sf";
 
 static struct ast_filestream *g723_open(int fd)
 {

Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- format_wav_gsm.c	3 Feb 2004 16:57:00 -0000	1.16
+++ format_wav_gsm.c	25 Feb 2004 22:33:49 -0000	1.16.2.1
@@ -68,7 +68,7 @@
 
 static char *name = "wav49";
 static char *desc = "Microsoft WAV format (Proprietary GSM)";
-static char *exts = "WAV";
+static char *exts = "WAV|wav49";
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define htoll(b) (b)
@@ -199,10 +199,12 @@
 		ast_log(LOG_WARNING, "Read failed (data)\n");
 		return -1;
 	}
+#if 0  /* Does this header actually exist?  It doesn't appear to in the files that are created with ast_writefile using this format */
 	if (memcmp(&data, "data", 4)) {
 		ast_log(LOG_WARNING, "Does not say data\n");
 		return -1;
 	}
+#endif
 	/* Ignore the data length */
 	if (read(fd, &data, 4) != 4) {
 		ast_log(LOG_WARNING, "Read failed (data)\n");