diff options
Diffstat (limited to '3rdparty/libflac/include/FLAC++/decoder.h')
-rw-r--r-- | 3rdparty/libflac/include/FLAC++/decoder.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/3rdparty/libflac/include/FLAC++/decoder.h b/3rdparty/libflac/include/FLAC++/decoder.h index 719f66c5be1..6f0bda99a08 100644 --- a/3rdparty/libflac/include/FLAC++/decoder.h +++ b/3rdparty/libflac/include/FLAC++/decoder.h @@ -1,5 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library - * Copyright (C) 2002,2003,2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2002-2009 Josh Coalson + * Copyright (C) 2011-2023 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -93,7 +94,7 @@ namespace FLAC { * Only the read, write, and error callbacks are mandatory. The * others are optional; this class provides default * implementations that do nothing. In order for seeking to work - * you must overide seek_callback(), tell_callback(), + * you must override seek_callback(), tell_callback(), * length_callback(), and eof_callback(). */ class FLACPP_API Stream { @@ -114,7 +115,7 @@ namespace FLAC { virtual ~Stream(); //@{ - /** Call after construction to check the that the object was created + /** Call after construction to check that the object was created * successfully. If not, use get_state() to find out why not. */ virtual bool is_valid() const; @@ -134,11 +135,11 @@ namespace FLAC { State get_state() const; ///< See FLAC__stream_decoder_get_state() virtual bool get_md5_checking() const; ///< See FLAC__stream_decoder_get_md5_checking() virtual FLAC__uint64 get_total_samples() const; ///< See FLAC__stream_decoder_get_total_samples() - virtual unsigned get_channels() const; ///< See FLAC__stream_decoder_get_channels() + virtual uint32_t get_channels() const; ///< See FLAC__stream_decoder_get_channels() virtual ::FLAC__ChannelAssignment get_channel_assignment() const; ///< See FLAC__stream_decoder_get_channel_assignment() - virtual unsigned get_bits_per_sample() const; ///< See FLAC__stream_decoder_get_bits_per_sample() - virtual unsigned get_sample_rate() const; ///< See FLAC__stream_decoder_get_sample_rate() - virtual unsigned get_blocksize() const; ///< See FLAC__stream_decoder_get_blocksize() + virtual uint32_t get_bits_per_sample() const; ///< See FLAC__stream_decoder_get_bits_per_sample() + virtual uint32_t get_sample_rate() const; ///< See FLAC__stream_decoder_get_sample_rate() + virtual uint32_t get_blocksize() const; ///< See FLAC__stream_decoder_get_blocksize() virtual bool get_decode_position(FLAC__uint64 *position) const; ///< See FLAC__stream_decoder_get_decode_position() virtual ::FLAC__StreamDecoderInitStatus init(); ///< Seek FLAC__stream_decoder_init_stream() @@ -180,8 +181,8 @@ namespace FLAC { /// see FLAC__StreamDecoderErrorCallback virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; -#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) - // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring() +#if (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) + // lame hack: some compilers can't see a protected decoder_ from nested State::resolved_as_cstring() friend State; #endif ::FLAC__StreamDecoder *decoder_; @@ -224,9 +225,11 @@ namespace FLAC { File(); virtual ~File(); + using Stream::init; virtual ::FLAC__StreamDecoderInitStatus init(FILE *file); ///< See FLAC__stream_decoder_init_FILE() virtual ::FLAC__StreamDecoderInitStatus init(const char *filename); ///< See FLAC__stream_decoder_init_file() virtual ::FLAC__StreamDecoderInitStatus init(const std::string &filename); ///< See FLAC__stream_decoder_init_file() + using Stream::init_ogg; virtual ::FLAC__StreamDecoderInitStatus init_ogg(FILE *file); ///< See FLAC__stream_decoder_init_ogg_FILE() virtual ::FLAC__StreamDecoderInitStatus init_ogg(const char *filename); ///< See FLAC__stream_decoder_init_ogg_file() virtual ::FLAC__StreamDecoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_decoder_init_ogg_file() |