another big glob of changes/fixes

[platform/upstream/flac.git] / include / FLAC++ / decoder.h

diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h
index 4d29cb6..de8884d 100644 (file)
--- a/include/FLAC++/decoder.h
+++ b/include/FLAC++/decoder.h
@@ -68,10 +68,10 @@ namespace FLAC {
                        bool is_valid() const;
                        inline operator bool() const { return is_valid(); }
 
-                       bool set_metadata_respond(::FLAC__MetaDataType type);
+                       bool set_metadata_respond(::FLAC__MetadataType type);
                        bool set_metadata_respond_application(const FLAC__byte id[4]);
                        bool set_metadata_respond_all();
-                       bool set_metadata_ignore(::FLAC__MetaDataType type);
+                       bool set_metadata_ignore(::FLAC__MetadataType type);
                        bool set_metadata_ignore_application(const FLAC__byte id[4]);
                        bool set_metadata_ignore_all();
 
@@ -99,14 +99,14 @@ namespace FLAC {
                protected:
                        virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes) = 0;
                        virtual ::FLAC__StreamDecoderWriteStatus write_callback(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) = 0;
-                       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;
 
                        ::FLAC__StreamDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
                        static ::FLAC__StreamDecoderWriteStatus write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-                       static void metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetaData *metadata, void *client_data);
+                       static void metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
                        static void error_callback_(const ::FLAC__StreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data);
 
                        // Private and undefined so you can't use them:
@@ -138,10 +138,10 @@ namespace FLAC {
                        inline operator bool() const { return is_valid(); }
 
                        bool set_md5_checking(bool value);
-                       bool set_metadata_respond(::FLAC__MetaDataType type);
+                       bool set_metadata_respond(::FLAC__MetadataType type);
                        bool set_metadata_respond_application(const FLAC__byte id[4]);
                        bool set_metadata_respond_all();
-                       bool set_metadata_ignore(::FLAC__MetaDataType type);
+                       bool set_metadata_ignore(::FLAC__MetadataType type);
                        bool set_metadata_ignore_application(const FLAC__byte id[4]);
                        bool set_metadata_ignore_all();
 
@@ -173,7 +173,7 @@ namespace FLAC {
                        virtual ::FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length) = 0;
                        virtual bool eof_callback() = 0;
                        virtual ::FLAC__StreamDecoderWriteStatus write_callback(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) = 0;
-                       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;
 
                        ::FLAC__SeekableStreamDecoder *decoder_;
@@ -184,7 +184,7 @@ namespace FLAC {
                        static FLAC__SeekableStreamDecoderLengthStatus length_callback_(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
                        static FLAC__bool eof_callback_(const ::FLAC__SeekableStreamDecoder *decoder, void *client_data);
                        static FLAC__StreamDecoderWriteStatus write_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-                       static void metadata_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetaData *metadata, void *client_data);
+                       static void metadata_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
                        static void error_callback_(const ::FLAC__SeekableStreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data);
 
                        // Private and undefined so you can't use them:
@@ -217,10 +217,10 @@ namespace FLAC {
 
                        bool set_md5_checking(bool value);
                        bool set_filename(const char *value); // 'value' may not be 0; use "-" for stdin
-                       bool set_metadata_respond(::FLAC__MetaDataType type);
+                       bool set_metadata_respond(::FLAC__MetadataType type);
                        bool set_metadata_respond_application(const FLAC__byte id[4]);
                        bool set_metadata_respond_all();
-                       bool set_metadata_ignore(::FLAC__MetaDataType type);
+                       bool set_metadata_ignore(::FLAC__MetadataType type);
                        bool set_metadata_ignore_application(const FLAC__byte id[4]);
                        bool set_metadata_ignore_all();
 
@@ -244,13 +244,13 @@ namespace FLAC {
                        bool seek_absolute(FLAC__uint64 sample);
                protected:
                        virtual ::FLAC__StreamDecoderWriteStatus write_callback(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) = 0;
-                       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;
 
                        ::FLAC__FileDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderWriteStatus write_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-                       static void metadata_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__StreamMetaData *metadata, void *client_data);
+                       static void metadata_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
                        static void error_callback_(const ::FLAC__FileDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data);
 
                        // Private and undefined so you can't use them: