[Asterisk-cvs] asterisk/formats format_wav_gsm.c,1.16.2.1,1.16.2.2

[citats at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	format_wav_gsm.c 
Log Message:
Really fix format_wav_gsm.c.  Thanks PCadach! (bug #1087)



Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- format_wav_gsm.c	25 Feb 2004 22:33:49 -0000	1.16.2.1
+++ format_wav_gsm.c	26 Feb 2004 06:46:48 -0000	1.16.2.2
@@ -199,12 +199,10 @@
 		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");
@@ -483,7 +481,7 @@
 static int wav_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
 	off_t offset=0,distance,cur,min,max;
-	min = 52;
+	min = 60;
 	cur = lseek(fs->fd, 0, SEEK_CUR);
 	max = lseek(fs->fd, 0, SEEK_END);
 	/* I'm getting sloppy here, I'm only going to go to even splits of the 2