From: Frantisek D. <va...@us...> - 2005-01-30 14:41:53
|
Update of /cvsroot/xine/xine-lib/src/libmusepack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31047 Modified Files: mpc_decoder.c mpc_reader.c xine_decoder.c Log Message: **BUGFIX** Import WIN32 compile fix from musepack SVN. Index: mpc_decoder.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libmusepack/mpc_decoder.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mpc_decoder.c 16 Jan 2005 17:55:31 -0000 1.2 +++ mpc_decoder.c 30 Jan 2005 14:41:34 -0000 1.3 @@ -61,7 +61,7 @@ void mpc_decoder_read_bitstream_sv6(mpc_decoder *d); void mpc_decoder_read_bitstream_sv7(mpc_decoder *d); void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING); -BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample); +mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample); void mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band); //------------------------------------------------------------------------------ @@ -72,7 +72,7 @@ return d->r->read(d->r->data, ptr, size); }; -static BOOL f_seek(mpc_decoder *d, mpc_int32_t offset) +static mpc_bool_t f_seek(mpc_decoder *d, mpc_int32_t offset) { return d->r->seek(d->r->data, offset); }; @@ -1191,7 +1191,7 @@ d->samples_to_skip = MPC_DECODER_SYNTH_DELAY; } -BOOL mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) +mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) { mpc_decoder_set_streaminfo(d, si); @@ -1264,12 +1264,12 @@ return fpos; } -BOOL mpc_decoder_seek_seconds(mpc_decoder *d, double seconds) +mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *d, double seconds) { return mpc_decoder_seek_sample(d, (mpc_int64_t)(seconds * (double)d->SampleRate + 0.5)); } -BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample) +mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample) { mpc_uint32_t fpos; mpc_uint32_t fwd; Index: mpc_reader.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libmusepack/mpc_reader.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpc_reader.c 14 Jan 2005 15:24:25 -0000 1.1 +++ mpc_reader.c 30 Jan 2005 14:41:34 -0000 1.2 @@ -46,7 +46,7 @@ return fread(ptr, 1, size, d->file); } -static BOOL +static mpc_bool_t seek_impl(void *data, int offset) { mpc_reader *d = (mpc_reader *) data; @@ -70,7 +70,7 @@ return d->file_size; } -static BOOL +static mpc_bool_t canseek_impl(void *data) { mpc_reader *d = (mpc_reader *) data; Index: xine_decoder.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libmusepack/xine_decoder.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xine_decoder.c 29 Jan 2005 18:33:53 -0000 1.3 +++ xine_decoder.c 30 Jan 2005 14:41:34 -0000 1.4 @@ -106,7 +106,7 @@ } /* Seeks to byte position offset. */ -static BOOL mpc_reader_seek(void *data, int32_t offset) { +static mpc_bool_t mpc_reader_seek(void *data, int32_t offset) { mpc_decoder_t *this = (mpc_decoder_t *) data; lprintf("mpc_reader_seek: offset=%d\n", offset); @@ -136,7 +136,7 @@ } /* True if the stream is a seekable stream. */ -static BOOL mpc_reader_canseek(void *data) { +static mpc_bool_t mpc_reader_canseek(void *data) { lprintf("mpc_reader_canseek\n"); return TRUE; |