You've already forked libsndfile
mirror of
https://github.com/OldUnreal/libsndfile.git
synced 2026-04-02 21:43:35 -07:00
msvc: Fix annoying conversion warnings #304
This commit is contained in:
@@ -118,7 +118,7 @@ encode_file (const char *infilename, const char *outfilename, int filetype)
|
||||
exit (1) ;
|
||||
} ;
|
||||
|
||||
while ((readcount = sf_read_float (infile, buffer, BUFFER_LEN)) > 0)
|
||||
while ((readcount = (int) sf_read_float (infile, buffer, BUFFER_LEN)) > 0)
|
||||
sf_write_float (outfile, buffer, readcount) ;
|
||||
|
||||
sf_close (infile) ;
|
||||
|
||||
@@ -74,12 +74,12 @@ main (void)
|
||||
|
||||
if (sfinfo.channels == 1)
|
||||
{ for (k = 0 ; k < SAMPLE_COUNT ; k++)
|
||||
buffer [k] = AMPLITUDE * sin (LEFT_FREQ * 2 * k * M_PI) ;
|
||||
buffer [k] = (int) (AMPLITUDE * sin (LEFT_FREQ * 2 * k * M_PI)) ;
|
||||
}
|
||||
else if (sfinfo.channels == 2)
|
||||
{ for (k = 0 ; k < SAMPLE_COUNT ; k++)
|
||||
{ buffer [2 * k] = AMPLITUDE * sin (LEFT_FREQ * 2 * k * M_PI) ;
|
||||
buffer [2 * k + 1] = AMPLITUDE * sin (RIGHT_FREQ * 2 * k * M_PI) ;
|
||||
{ buffer [2 * k] = (int) (AMPLITUDE * sin (LEFT_FREQ * 2 * k * M_PI)) ;
|
||||
buffer [2 * k + 1] = (int) (AMPLITUDE * sin (RIGHT_FREQ * 2 * k * M_PI)) ;
|
||||
} ;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -110,7 +110,7 @@ main (void)
|
||||
/* While there are.frames in the input file, read them, process
|
||||
** them and write them to the output file.
|
||||
*/
|
||||
while ((readcount = sf_read_double (infile, data, BUFFER_LEN)))
|
||||
while ((readcount = (int) sf_read_double (infile, data, BUFFER_LEN)))
|
||||
{ process_data (data, readcount, sfinfo.channels) ;
|
||||
sf_write_double (outfile, data, readcount) ;
|
||||
} ;
|
||||
|
||||
@@ -143,7 +143,7 @@ sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels)
|
||||
readcount = frames ;
|
||||
|
||||
while (readcount > 0)
|
||||
{ readcount = sf_readf_int (infile, data, frames) ;
|
||||
{ readcount = (int) sf_readf_int (infile, data, frames) ;
|
||||
sf_writef_int (outfile, data, readcount) ;
|
||||
} ;
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ convert_to_text (SNDFILE * infile, FILE * outfile, int channels, int full_precis
|
||||
|
||||
frames = BLOCK_SIZE / channels ;
|
||||
|
||||
while ((readcount = sf_readf_float (infile, buf, frames)) > 0)
|
||||
while ((readcount = (int) sf_readf_float (infile, buf, frames)) > 0)
|
||||
{ for (k = 0 ; k < readcount ; k++)
|
||||
{ for (m = 0 ; m < channels ; m++)
|
||||
if (full_precision)
|
||||
|
||||
@@ -91,7 +91,7 @@ sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels)
|
||||
readcount = frames ;
|
||||
|
||||
while (readcount > 0)
|
||||
{ readcount = sf_readf_int (infile, data, frames) ;
|
||||
{ readcount = (int) sf_readf_int (infile, data, frames) ;
|
||||
sf_writef_int (outfile, data, readcount) ;
|
||||
} ;
|
||||
|
||||
@@ -157,7 +157,7 @@ merge_broadcast_info (SNDFILE * infile, SNDFILE * outfile, int format, const MET
|
||||
/* Special case loudness values */
|
||||
#define REPLACE_IF_NEW_INT(x) \
|
||||
if (info->x != NULL) \
|
||||
{ binfo.x = round (atof (info->x) * 100.0) ; \
|
||||
{ binfo.x = (int16_t) round (atof (info->x) * 100.0) ; \
|
||||
} ;
|
||||
|
||||
REPLACE_IF_NEW_INT (loudness_value) ;
|
||||
@@ -177,7 +177,7 @@ merge_broadcast_info (SNDFILE * infile, SNDFILE * outfile, int format, const MET
|
||||
/* Special case for coding_history because we may want to append. */
|
||||
if (info->coding_history != NULL)
|
||||
{ if (info->coding_hist_append)
|
||||
{ int slen = strlen (binfo.coding_history) ;
|
||||
{ int slen = (int) strlen (binfo.coding_history) ;
|
||||
|
||||
while (slen > 1 && isspace (binfo.coding_history [slen - 1]))
|
||||
slen -- ;
|
||||
@@ -189,7 +189,7 @@ merge_broadcast_info (SNDFILE * infile, SNDFILE * outfile, int format, const MET
|
||||
|
||||
memset (binfo.coding_history, 0, sizeof (binfo.coding_history)) ;
|
||||
memcpy (binfo.coding_history, info->coding_history, slen) ;
|
||||
binfo.coding_history_size = slen ;
|
||||
binfo.coding_history_size = (uint32_t) slen ;
|
||||
} ;
|
||||
} ;
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ concat_data_fp (SNDFILE *wfile, SNDFILE *rofile, int channels)
|
||||
sf_seek (wfile, 0, SEEK_END) ;
|
||||
|
||||
while (readcount > 0)
|
||||
{ readcount = sf_readf_double (rofile, data, frames) ;
|
||||
{ readcount = (int) sf_readf_double (rofile, data, frames) ;
|
||||
sf_writef_double (wfile, data, readcount) ;
|
||||
} ;
|
||||
|
||||
@@ -161,7 +161,7 @@ concat_data_int (SNDFILE *wfile, SNDFILE *rofile, int channels)
|
||||
sf_seek (wfile, 0, SEEK_END) ;
|
||||
|
||||
while (readcount > 0)
|
||||
{ readcount = sf_readf_int (rofile, data, frames) ;
|
||||
{ readcount = (int) sf_readf_int (rofile, data, frames) ;
|
||||
sf_writef_int (wfile, data, readcount) ;
|
||||
} ;
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@ copy_metadata (SNDFILE *outfile, SNDFILE *infile, int channels)
|
||||
memset (&binfo, 0, sizeof (binfo)) ;
|
||||
|
||||
if (channels < ARRAY_LEN (chanmap))
|
||||
{ size_t size = channels * sizeof (chanmap [0]) ;
|
||||
{ int size = channels * sizeof (chanmap [0]) ;
|
||||
|
||||
if (sf_command (infile, SFC_GET_CHANNEL_MAP_INFO, chanmap, size) == SF_TRUE)
|
||||
sf_command (outfile, SFC_SET_CHANNEL_MAP_INFO, chanmap, size) ;
|
||||
|
||||
@@ -190,7 +190,7 @@ deinterleave_int (STATE * state)
|
||||
int ch, k ;
|
||||
|
||||
do
|
||||
{ read_len = sf_readf_int (state->infile, state->din.i, BUFFER_LEN) ;
|
||||
{ read_len = (int) sf_readf_int (state->infile, state->din.i, BUFFER_LEN) ;
|
||||
|
||||
for (ch = 0 ; ch < state->channels ; ch ++)
|
||||
{ for (k = 0 ; k < read_len ; k++)
|
||||
@@ -208,7 +208,7 @@ deinterleave_double (STATE * state)
|
||||
int ch, k ;
|
||||
|
||||
do
|
||||
{ read_len = sf_readf_double (state->infile, state->din.d, BUFFER_LEN) ;
|
||||
{ read_len = (int) sf_readf_double (state->infile, state->din.d, BUFFER_LEN) ;
|
||||
|
||||
for (ch = 0 ; ch < state->channels ; ch ++)
|
||||
{ for (k = 0 ; k < read_len ; k++)
|
||||
|
||||
@@ -159,7 +159,7 @@ interleave_int (STATE * state)
|
||||
{ max_read_len = 0 ;
|
||||
|
||||
for (ch = 0 ; ch < state->channels ; ch ++)
|
||||
{ read_len = sf_read_int (state->infile [ch], state->din.i, BUFFER_LEN) ;
|
||||
{ read_len = (int) sf_read_int (state->infile [ch], state->din.i, BUFFER_LEN) ;
|
||||
if (read_len < BUFFER_LEN)
|
||||
memset (state->din.i + read_len, 0, sizeof (state->din.i [0]) * (BUFFER_LEN - read_len)) ;
|
||||
|
||||
@@ -185,7 +185,7 @@ interleave_double (STATE * state)
|
||||
{ max_read_len = 0 ;
|
||||
|
||||
for (ch = 0 ; ch < state->channels ; ch ++)
|
||||
{ read_len = sf_read_double (state->infile [ch], state->din.d, BUFFER_LEN) ;
|
||||
{ read_len = (int) sf_read_double (state->infile [ch], state->din.d, BUFFER_LEN) ;
|
||||
if (read_len < BUFFER_LEN)
|
||||
memset (state->din.d + read_len, 0, sizeof (state->din.d [0]) * (BUFFER_LEN - read_len)) ;
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ find_data_offset (int fd, int format)
|
||||
exit (1) ;
|
||||
} ;
|
||||
|
||||
slen = strlen (target) ;
|
||||
slen = (int) strlen (target) ;
|
||||
|
||||
lseek_or_die (fd, 0, SEEK_SET) ;
|
||||
|
||||
|
||||
@@ -428,7 +428,7 @@ static void
|
||||
get_filename_pathname (REGTEST_DB * db, const char *filepath)
|
||||
{
|
||||
const char * basename = db_basename (filepath) ;
|
||||
int slen ;
|
||||
size_t slen ;
|
||||
|
||||
/* Test for a relative path
|
||||
*/
|
||||
|
||||
16
src/alac.c
16
src/alac.c
@@ -471,7 +471,7 @@ alac_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
|
||||
break ;
|
||||
|
||||
readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
|
||||
readcount = readcount > len ? len : readcount ;
|
||||
readcount = readcount > len ? (int) len : readcount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -501,7 +501,7 @@ alac_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
|
||||
break ;
|
||||
|
||||
readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
|
||||
readcount = readcount > len ? len : readcount ;
|
||||
readcount = readcount > len ? (int) len : readcount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -534,7 +534,7 @@ alac_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
|
||||
break ;
|
||||
|
||||
readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
|
||||
readcount = readcount > len ? len : readcount ;
|
||||
readcount = readcount > len ? (int) len : readcount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -567,7 +567,7 @@ alac_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
|
||||
break ;
|
||||
|
||||
readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
|
||||
readcount = readcount > len ? len : readcount ;
|
||||
readcount = readcount > len ? (int) len : readcount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -648,7 +648,7 @@ alac_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
|
||||
|
||||
while (len > 0)
|
||||
{ writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
|
||||
writecount = (writecount == 0 || writecount > len) ? len : writecount ;
|
||||
writecount = (writecount == 0 || writecount > len) ? (int) len : writecount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -679,7 +679,7 @@ alac_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
|
||||
|
||||
while (len > 0)
|
||||
{ writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
|
||||
writecount = (writecount == 0 || writecount > len) ? len : writecount ;
|
||||
writecount = (writecount == 0 || writecount > len) ? (int) len : writecount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -713,7 +713,7 @@ alac_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
|
||||
|
||||
while (len > 0)
|
||||
{ writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
|
||||
writecount = (writecount == 0 || writecount > len) ? len : writecount ;
|
||||
writecount = (writecount == 0 || writecount > len) ? (int) len : writecount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
@@ -746,7 +746,7 @@ alac_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
|
||||
|
||||
while (len > 0)
|
||||
{ writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
|
||||
writecount = (writecount == 0 || writecount > len) ? len : writecount ;
|
||||
writecount = (writecount == 0 || writecount > len) ? (int) len : writecount ;
|
||||
|
||||
iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
|
||||
|
||||
|
||||
16
src/alaw.c
16
src/alaw.c
@@ -372,7 +372,7 @@ alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
|
||||
while (len > 0)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
readcount = (int) psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
alaw2s_array (ubuf.ucbuf, readcount, ptr + total) ;
|
||||
total += readcount ;
|
||||
if (readcount < bufferlen)
|
||||
@@ -394,7 +394,7 @@ alaw_read_alaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
|
||||
while (len > 0)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
readcount = (int) psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
alaw2i_array (ubuf.ucbuf, readcount, ptr + total) ;
|
||||
total += readcount ;
|
||||
if (readcount < bufferlen)
|
||||
@@ -419,7 +419,7 @@ alaw_read_alaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
|
||||
while (len > 0)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
readcount = (int) psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
alaw2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
|
||||
total += readcount ;
|
||||
if (readcount < bufferlen)
|
||||
@@ -443,7 +443,7 @@ alaw_read_alaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
|
||||
while (len > 0)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
readcount = (int) psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
alaw2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
|
||||
total += readcount ;
|
||||
if (readcount < bufferlen)
|
||||
@@ -469,7 +469,7 @@ alaw_write_s2alaw (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
s2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
|
||||
writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
writecount = (int) psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
total += writecount ;
|
||||
if (writecount < bufferlen)
|
||||
break ;
|
||||
@@ -491,7 +491,7 @@ alaw_write_i2alaw (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
i2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
|
||||
writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
writecount = (int) psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
total += writecount ;
|
||||
if (writecount < bufferlen)
|
||||
break ;
|
||||
@@ -516,7 +516,7 @@ alaw_write_f2alaw (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
f2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
|
||||
writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
writecount = (int) psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
total += writecount ;
|
||||
if (writecount < bufferlen)
|
||||
break ;
|
||||
@@ -541,7 +541,7 @@ alaw_write_d2alaw (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
|
||||
{ if (len < bufferlen)
|
||||
bufferlen = (int) len ;
|
||||
d2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
|
||||
writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
writecount = (int) psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
|
||||
total += writecount ;
|
||||
if (writecount < bufferlen)
|
||||
break ;
|
||||
|
||||
@@ -84,7 +84,7 @@ broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * info, size_t datas
|
||||
/* Force coding_history_size to be even. */
|
||||
len = strlen (psf->broadcast_16k->coding_history) ;
|
||||
len += (len & 1) ? 1 : 0 ;
|
||||
psf->broadcast_16k->coding_history_size = len ;
|
||||
psf->broadcast_16k->coding_history_size = (uint32_t) len ;
|
||||
|
||||
/* Currently writing this version. */
|
||||
psf->broadcast_16k->version = 2 ;
|
||||
|
||||
16
src/caf.c
16
src/caf.c
@@ -407,7 +407,7 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
{ case peak_MARKER :
|
||||
psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
|
||||
if (chunk_size != CAF_PEAK_CHUNK_SIZE (psf->sf.channels))
|
||||
{ psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
|
||||
{ psf_binheader_readf (psf, "j", (size_t) chunk_size) ;
|
||||
psf_log_printf (psf, "*** File PEAK chunk %D should be %d.\n", chunk_size, CAF_PEAK_CHUNK_SIZE (psf->sf.channels)) ;
|
||||
return SFE_CAF_BAD_PEAK ;
|
||||
} ;
|
||||
@@ -443,7 +443,7 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
case chan_MARKER :
|
||||
if (chunk_size < 12)
|
||||
{ psf_log_printf (psf, "%M : %D (should be >= 12)\n", marker, chunk_size) ;
|
||||
psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) chunk_size) ;
|
||||
break ;
|
||||
}
|
||||
|
||||
@@ -455,7 +455,7 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
|
||||
case free_MARKER :
|
||||
psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
|
||||
psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) chunk_size) ;
|
||||
break ;
|
||||
|
||||
case data_MARKER :
|
||||
@@ -480,14 +480,14 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
if (psf->datalength + psf->dataoffset < psf->filelength)
|
||||
psf->dataend = psf->datalength + psf->dataoffset ;
|
||||
|
||||
psf_binheader_readf (psf, "j", make_size_t (psf->datalength)) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) psf->datalength) ;
|
||||
have_data = 1 ;
|
||||
break ;
|
||||
|
||||
case kuki_MARKER :
|
||||
psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
|
||||
pcaf->alac.kuki_offset = psf_ftell (psf) - 12 ;
|
||||
psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) chunk_size) ;
|
||||
break ;
|
||||
|
||||
case pakt_MARKER :
|
||||
@@ -519,7 +519,7 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
psf_log_printf (psf, "*** 'pakt' chunk header is all zero.\n") ;
|
||||
|
||||
pcaf->alac.pakt_offset = psf_ftell (psf) - 12 ;
|
||||
psf_binheader_readf (psf, "j", make_size_t (chunk_size) - 24) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) chunk_size - 24) ;
|
||||
break ;
|
||||
|
||||
case info_MARKER :
|
||||
@@ -538,7 +538,7 @@ caf_read_header (SF_PRIVATE *psf)
|
||||
|
||||
default :
|
||||
psf_log_printf (psf, "%M : %D (skipped)\n", marker, chunk_size) ;
|
||||
psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
|
||||
psf_binheader_readf (psf, "j", (size_t) chunk_size) ;
|
||||
break ;
|
||||
} ;
|
||||
|
||||
@@ -846,7 +846,7 @@ caf_read_strings (SF_PRIVATE * psf, sf_count_t chunk_size)
|
||||
if ((buf = malloc (chunk_size + 1)) == NULL)
|
||||
return (psf->error = SFE_MALLOC_FAILED) ;
|
||||
|
||||
psf_binheader_readf (psf, "E4b", &count, buf, make_size_t (chunk_size)) ;
|
||||
psf_binheader_readf (psf, "E4b", &count, buf, (size_t) chunk_size) ;
|
||||
psf_log_printf (psf, " count: %u\n", count) ;
|
||||
|
||||
/* Force terminate `buf` to make sure. */
|
||||
|
||||
@@ -79,7 +79,7 @@ cart_var_set (SF_PRIVATE *psf, const SF_CART_INFO * info, size_t datasize)
|
||||
len = strlen (psf->cart_16k->tag_text) ;
|
||||
len += (len & 1) ? 1 : 2 ;
|
||||
|
||||
psf->cart_16k->tag_text_size = len ;
|
||||
psf->cart_16k->tag_text_size = (uint32_t) len ;
|
||||
|
||||
return SF_TRUE ;
|
||||
} /* cart_var_set */
|
||||
|
||||
@@ -75,7 +75,7 @@ psf_get_chunk_iterator (SF_PRIVATE * psf, const char * marker_str)
|
||||
hash = marker_len > 4 ? hash_of_str (marker_str) : u.marker ;
|
||||
|
||||
memcpy (psf->iterator->id, marker_str, marker_len) ;
|
||||
psf->iterator->id_size = marker_len ;
|
||||
psf->iterator->id_size = (unsigned) marker_len ;
|
||||
psf->iterator->hash = hash ;
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ psf_store_read_chunk_str (READ_CHUNKS * pchk, const char * marker_str, sf_count_
|
||||
rchunk.offset = offset ;
|
||||
rchunk.len = len ;
|
||||
|
||||
rchunk.id_size = marker_len > 64 ? 64 : marker_len ;
|
||||
rchunk.id_size = marker_len > 64 ? 64 : (unsigned) marker_len ;
|
||||
memcpy (rchunk.id, marker_str, rchunk.id_size) ;
|
||||
|
||||
return psf_store_read_chunk (pchk, &rchunk) ;
|
||||
|
||||
@@ -309,7 +309,7 @@ psf_calc_signal_max (SF_PRIVATE *psf, int normalize)
|
||||
len = ARRAY_LEN (ubuf.dbuf) - (ARRAY_LEN (ubuf.dbuf) % psf->sf.channels) ;
|
||||
|
||||
for (readcount = 1, max_val = 0.0 ; readcount > 0 ; /* nothing */)
|
||||
{ readcount = sf_read_double ((SNDFILE*) psf, data, len) ;
|
||||
{ readcount = (int) sf_read_double ((SNDFILE*) psf, data, len) ;
|
||||
for (k = 0 ; k < readcount ; k++)
|
||||
{ temp = fabs (data [k]) ;
|
||||
max_val = temp > max_val ? temp : max_val ;
|
||||
@@ -354,7 +354,7 @@ psf_calc_max_all_channels (SF_PRIVATE *psf, double *peaks, int normalize)
|
||||
chan = 0 ;
|
||||
readcount = len ;
|
||||
while (readcount > 0)
|
||||
{ readcount = sf_read_double ((SNDFILE*) psf, data, len) ;
|
||||
{ readcount = (int) sf_read_double ((SNDFILE*) psf, data, len) ;
|
||||
for (k = 0 ; k < readcount ; k++)
|
||||
{ temp = fabs (data [k]) ;
|
||||
peaks [chan] = temp > peaks [chan] ? temp : peaks [chan] ;
|
||||
|
||||
28
src/common.c
28
src/common.c
@@ -525,24 +525,24 @@ header_put_le_int (SF_PRIVATE *psf, int x)
|
||||
static inline void
|
||||
header_put_be_8byte (SF_PRIVATE *psf, sf_count_t x)
|
||||
{ psf->header.ptr [psf->header.indx++] = (x >> 56) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 48) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 40) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 32) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 24) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 16) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 8) ;
|
||||
psf->header.ptr [psf->header.indx++] = x ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 48) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 40) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 32) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 24) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 16) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 8) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) x ;
|
||||
} /* header_put_be_8byte */
|
||||
|
||||
static inline void
|
||||
header_put_le_8byte (SF_PRIVATE *psf, sf_count_t x)
|
||||
{ psf->header.ptr [psf->header.indx++] = x ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 8) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 16) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 24) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 32) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 40) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 48) ;
|
||||
{ psf->header.ptr [psf->header.indx++] = (unsigned char) x ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 8) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 16) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 24) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 32) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 40) ;
|
||||
psf->header.ptr [psf->header.indx++] = (unsigned char) (x >> 48) ;
|
||||
psf->header.ptr [psf->header.indx++] = (x >> 56) ;
|
||||
} /* header_put_le_8byte */
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user