AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extend hack of making decoder_ pointer public to gcc < 2.96

Browse Source
This commit is contained in:
Josh Coalson 2004-07-27 00:22:51 +00:00
parent 384ef23ee0
commit 26b69845eb
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/FLAC++/decoder.h
View File

@ -141,8 +141,8 @@ namespace FLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__StreamDecoder *decoder_; ::FLAC__StreamDecoder *decoder_;
@ -236,8 +236,8 @@ namespace FLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__SeekableStreamDecoder *decoder_; ::FLAC__SeekableStreamDecoder *decoder_;
@ -329,8 +329,8 @@ namespace FLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__FileDecoder *decoder_; ::FLAC__FileDecoder *decoder_;

12
include/FLAC++/encoder.h
View File

@ -159,8 +159,8 @@ namespace FLAC {
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__StreamEncoder *encoder_; ::FLAC__StreamEncoder *encoder_;
@ -259,8 +259,8 @@ namespace FLAC {
virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0; virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__SeekableStreamEncoder *encoder_; ::FLAC__SeekableStreamEncoder *encoder_;
@ -360,8 +360,8 @@ namespace FLAC {
protected: protected:
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate); virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::FLAC__FileEncoder *encoder_; ::FLAC__FileEncoder *encoder_;

12
include/OggFLAC++/decoder.h
View File

@ -144,8 +144,8 @@ namespace OggFLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__StreamDecoder *decoder_; ::OggFLAC__StreamDecoder *decoder_;
@ -240,8 +240,8 @@ namespace OggFLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__SeekableStreamDecoder *decoder_; ::OggFLAC__SeekableStreamDecoder *decoder_;
@ -334,8 +334,8 @@ namespace OggFLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__FileDecoder *decoder_; ::OggFLAC__FileDecoder *decoder_;

12
include/OggFLAC++/encoder.h
View File

@ -162,8 +162,8 @@ namespace OggFLAC {
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__StreamEncoder *encoder_; ::OggFLAC__StreamEncoder *encoder_;
@ -263,8 +263,8 @@ namespace OggFLAC {
virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0; virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__SeekableStreamEncoder *encoder_; ::OggFLAC__SeekableStreamEncoder *encoder_;
@ -365,8 +365,8 @@ namespace OggFLAC {
protected: protected:
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate); virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
#ifdef _MSC_VER #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
public: public:
#endif #endif
::OggFLAC__FileEncoder *encoder_; ::OggFLAC__FileEncoder *encoder_;