? Flac.bpf ? Flac.bpr Index: include/FLAC/ordinals.h =================================================================== RCS file: /cvsroot/flac/flac/include/FLAC/ordinals.h,v retrieving revision 1.12 diff -u -r1.12 ordinals.h --- include/FLAC/ordinals.h 25 Jan 2005 04:18:23 -0000 1.12 +++ include/FLAC/ordinals.h 26 Jan 2005 22:41:00 -0000 @@ -32,14 +32,14 @@ #ifndef FLAC__ORDINALS_H #define FLAC__ORDINALS_H -#ifndef _MSC_VER +#if !defined _MSC_VER && !defined __BORLANDC__ #include #endif typedef signed char FLAC__int8; typedef unsigned char FLAC__uint8; -#if defined _MSC_VER +#if defined _MSC_VER || defined __BORLANDC__ typedef __int16 FLAC__int16; typedef __int32 FLAC__int32; typedef __int64 FLAC__int64; Index: include/FLAC++/decoder.h =================================================================== RCS file: /cvsroot/flac/flac/include/FLAC++/decoder.h,v retrieving revision 1.24 diff -u -r1.24 decoder.h --- include/FLAC++/decoder.h 25 Jan 2005 04:18:24 -0000 1.24 +++ include/FLAC++/decoder.h 26 Jan 2005 22:58:50 -0000 @@ -95,7 +95,7 @@ inline State(::FLAC__StreamDecoderState state): state_(state) { } inline operator ::FLAC__StreamDecoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__StreamDecoderStateString[state_]; } - inline const char *resolved_as_cstring(const Stream &decoder) const { return ::FLAC__stream_decoder_get_resolved_state_string(decoder.decoder_); } + //Pb in BCB : Stream::decoder is not accessible //inline const char *resolved_as_cstring(const Stream &decoder) const { return ::FLAC__stream_decoder_get_resolved_state_string(decoder.decoder_); } protected: ::FLAC__StreamDecoderState state_; }; @@ -185,7 +185,7 @@ inline State(::FLAC__SeekableStreamDecoderState state): state_(state) { } inline operator ::FLAC__SeekableStreamDecoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__SeekableStreamDecoderStateString[state_]; } - inline const char *resolved_as_cstring(const SeekableStream &decoder) const { return ::FLAC__seekable_stream_decoder_get_resolved_state_string(decoder.decoder_); } + //Pb in BCB : SeekableStream::decoder_ is not accessible //inline const char *resolved_as_cstring(const SeekableStream &decoder) const { return ::FLAC__seekable_stream_decoder_get_resolved_state_string(decoder.decoder_); } protected: ::FLAC__SeekableStreamDecoderState state_; }; @@ -284,7 +284,7 @@ inline State(::FLAC__FileDecoderState state): state_(state) { } inline operator ::FLAC__FileDecoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__FileDecoderStateString[state_]; } - inline const char *resolved_as_cstring(const File &decoder) const { return ::FLAC__file_decoder_get_resolved_state_string(decoder.decoder_); } + //Pb in BCB : File::decoder_ is not accessible //inline const char *resolved_as_cstring(const File &decoder) const { return ::FLAC__file_decoder_get_resolved_state_string(decoder.decoder_); } protected: ::FLAC__FileDecoderState state_; }; Index: include/FLAC++/encoder.h =================================================================== RCS file: /cvsroot/flac/flac/include/FLAC++/encoder.h,v retrieving revision 1.27 diff -u -r1.27 encoder.h --- include/FLAC++/encoder.h 25 Jan 2005 04:18:24 -0000 1.27 +++ include/FLAC++/encoder.h 26 Jan 2005 22:59:10 -0000 @@ -97,7 +97,7 @@ inline State(::FLAC__StreamEncoderState state): state_(state) { } inline operator ::FLAC__StreamEncoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__StreamEncoderStateString[state_]; } - inline const char *resolved_as_cstring(const Stream &encoder) const { return ::FLAC__stream_encoder_get_resolved_state_string(encoder.encoder_); } + //Pb in BCB : Stream::encoder is not accessible //inline const char *resolved_as_cstring(const Stream &encoder) const { return ::FLAC__stream_encoder_get_resolved_state_string(encoder.encoder_); } protected: ::FLAC__StreamEncoderState state_; }; @@ -195,7 +195,7 @@ inline State(::FLAC__SeekableStreamEncoderState state): state_(state) { } inline operator ::FLAC__SeekableStreamEncoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__SeekableStreamEncoderStateString[state_]; } - inline const char *resolved_as_cstring(const SeekableStream &encoder) const { return ::FLAC__seekable_stream_encoder_get_resolved_state_string(encoder.encoder_); } + //Pb in BCB : SeekableStream::encoder_ is not accessible //inline const char *resolved_as_cstring(const SeekableStream &encoder) const { return ::FLAC__seekable_stream_encoder_get_resolved_state_string(encoder.encoder_); } protected: ::FLAC__SeekableStreamEncoderState state_; }; @@ -296,7 +296,7 @@ inline State(::FLAC__FileEncoderState state): state_(state) { } inline operator ::FLAC__FileEncoderState() const { return state_; } inline const char *as_cstring() const { return ::FLAC__FileEncoderStateString[state_]; } - inline const char *resolved_as_cstring(const File &encoder) const { return ::FLAC__file_encoder_get_resolved_state_string(encoder.encoder_); } + //Pb in BCB : File::encoder_ is not accessible //inline const char *resolved_as_cstring(const File &encoder) const { return ::FLAC__file_encoder_get_resolved_state_string(encoder.encoder_); } protected: ::FLAC__FileEncoderState state_; }; Index: src/flac/main.c =================================================================== RCS file: /cvsroot/flac/flac/src/flac/main.c,v retrieving revision 1.118 diff -u -r1.118 main.c --- src/flac/main.c 25 Jan 2005 04:18:29 -0000 1.118 +++ src/flac/main.c 26 Jan 2005 22:45:48 -0000 @@ -28,7 +28,7 @@ #include #endif -#if !defined _MSC_VER && !defined __MINGW32__ +#if !defined _MSC_VER && !defined __MINGW32__ && !defined __BORLANDC__ /* unlink is in stdio.h in VC++ */ #include /* for unlink() */ #else Index: src/libFLAC/lpc.c =================================================================== RCS file: /cvsroot/flac/flac/src/libFLAC/lpc.c,v retrieving revision 1.44 diff -u -r1.44 lpc.c --- src/libFLAC/lpc.c 26 Jan 2005 04:04:38 -0000 1.44 +++ src/libFLAC/lpc.c 26 Jan 2005 22:47:58 -0000 @@ -327,7 +327,7 @@ #endif #endif } - *(data++) = *(residual++) + (sum >> lp_quantization); + //*(data++) = *(residual++) + (sum >> lp_quantization); } /* Here's a slower but clearer version: @@ -369,7 +369,7 @@ break; } #endif - *(data++) = *(residual++) + (FLAC__int32)(sum >> lp_quantization); + //*(data++) = *(residual++) + (FLAC__int32)(sum >> lp_quantization); } } Index: src/libFLAC/metadata_iterators.c =================================================================== RCS file: /cvsroot/flac/flac/src/libFLAC/metadata_iterators.c,v retrieving revision 1.42 diff -u -r1.42 metadata_iterators.c --- src/libFLAC/metadata_iterators.c 25 Jan 2005 04:18:30 -0000 1.42 +++ src/libFLAC/metadata_iterators.c 26 Jan 2005 22:53:16 -0000 @@ -37,6 +37,9 @@ #if defined _MSC_VER || defined __MINGW32__ #include /* for utime() */ #include /* for chmod() */ +#elif defined __BORLANDC__ +#include /* for utime() */ +#include /* for chmod() */ #else #include /* some flavors of BSD (like OS X) require this to get time_t */ #include /* for utime() */ Index: src/libFLAC++/file_encoder.cpp =================================================================== RCS file: /cvsroot/flac/flac/src/libFLAC++/file_encoder.cpp,v retrieving revision 1.10 diff -u -r1.10 file_encoder.cpp --- src/libFLAC++/file_encoder.cpp 25 Jan 2005 04:18:35 -0000 1.10 +++ src/libFLAC++/file_encoder.cpp 26 Jan 2005 22:59:50 -0000 @@ -168,7 +168,7 @@ bool File::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks) { FLAC__ASSERT(is_valid()); -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // MSVC++ can't handle: // ::FLAC__StreamMetadata *m[num_blocks]; // so we do this ugly workaround @@ -180,7 +180,7 @@ // we can get away with this since we know the encoder will only correct the is_last flags m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]); } -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // complete the hack const bool ok = (bool)::FLAC__file_encoder_set_metadata(encoder_, m, num_blocks); delete [] m; Index: src/libFLAC++/seekable_stream_encoder.cpp =================================================================== RCS file: /cvsroot/flac/flac/src/libFLAC++/seekable_stream_encoder.cpp,v retrieving revision 1.11 diff -u -r1.11 seekable_stream_encoder.cpp --- src/libFLAC++/seekable_stream_encoder.cpp 25 Jan 2005 04:18:35 -0000 1.11 +++ src/libFLAC++/seekable_stream_encoder.cpp 26 Jan 2005 23:00:00 -0000 @@ -168,7 +168,7 @@ bool SeekableStream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks) { FLAC__ASSERT(is_valid()); -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // MSVC++ can't handle: // ::FLAC__StreamMetadata *m[num_blocks]; // so we do this ugly workaround @@ -180,7 +180,7 @@ // we can get away with this since we know the encoder will only correct the is_last flags m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]); } -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // complete the hack const bool ok = (bool)::FLAC__seekable_stream_encoder_set_metadata(encoder_, m, num_blocks); delete [] m; Index: src/libFLAC++/stream_encoder.cpp =================================================================== RCS file: /cvsroot/flac/flac/src/libFLAC++/stream_encoder.cpp,v retrieving revision 1.10 diff -u -r1.10 stream_encoder.cpp --- src/libFLAC++/stream_encoder.cpp 25 Jan 2005 04:18:35 -0000 1.10 +++ src/libFLAC++/stream_encoder.cpp 26 Jan 2005 23:01:04 -0000 @@ -169,7 +169,7 @@ bool Stream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks) { FLAC__ASSERT(is_valid()); -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // MSVC++ can't handle: // ::FLAC__StreamMetadata *m[num_blocks]; // so we do this ugly workaround @@ -181,7 +181,7 @@ // we can get away with this since we know the encoder will only correct the is_last flags m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]); } -#ifdef _MSC_VER +#if (defined _MSC_VER) || defined __BORLANDC__ // complete the hack const bool ok = (bool)::FLAC__stream_encoder_set_metadata(encoder_, m, num_blocks); delete [] m;