kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-4657 --resolve update libsndfile to its latest master

Browse Source
This commit is contained in:
Jeff Lenk
2014-02-21 16:09:43 -06:00
parent 0c1f6ef2ed
commit 199a64bf6a
291 changed files with 25966 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/libsndfile/src/rx2.c
View File

@@ -1,5 +1,5 @@
/*
** Copyright (C) 2001-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
** Copyright (C) 2001-2012 Erik de Castro Lopo <erikd@mega-nerd.com>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as published by
@@ -80,10 +80,9 @@ rx2_open (SF_PRIVATE *psf)
"Additional/PencilTool", "Disabled"
} ;
BUF_UNION ubuf ;
int error, marker, length, glob_offset, slce_count, frames ;
int sdat_length = 0, slce_total = 0 ;
int n_channels ;
@@ -119,14 +118,14 @@ rx2_open (SF_PRIVATE *psf)
/* Get name length */
length = 0 ;
psf_binheader_readf (psf, "1", &length) ;
if (length >= SIGNED_SIZEOF (psf->u.cbuf))
if (length >= SIGNED_SIZEOF (ubuf.cbuf))
{ psf_log_printf (psf, " Text : %d *** Error : Too sf_count_t!\n") ;
return -1001 ;
}
memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ;
psf_binheader_readf (psf, "b", psf->u.cbuf, length) ;
psf_log_printf (psf, " Text : \"%s\"\n", psf->u.cbuf) ;
memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ;
psf_binheader_readf (psf, "b", ubuf.cbuf, length) ;
psf_log_printf (psf, " Text : \"%s\"\n", ubuf.cbuf) ;
/* Jump to GLOB offset position. */
if (glob_offset & 1)
@@ -253,7 +252,7 @@ rx2_open (SF_PRIVATE *psf)
break ;
} ;
puts (psf->logbuffer) ;
puts (psf->parselog.buf) ;
puts ("-----------------------------------") ;
printf ("SDAT length : %d\n", sdat_length) ;
@@ -270,7 +269,7 @@ rx2_open (SF_PRIVATE *psf)
puts (" ") ;
psf->logbuffer [0] = 0 ;
psf->parselog.buf [0] = 0 ;
/* OK, have the header although not too sure what it all means. */
@@ -306,7 +305,7 @@ rx2_open (SF_PRIVATE *psf)
static int
rx2_close (SF_PRIVATE *psf)
{
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ /* Now we know for certain the length of the file we can re-write
** correct values for the FORM, 8SVX and BODY chunks.
*/