diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/FLAC++/decoder.h | 6 | ||||
-rw-r--r-- | include/FLAC++/encoder.h | 4 | ||||
-rw-r--r-- | include/FLAC/all.h | 4 | ||||
-rw-r--r-- | include/FLAC/stream_decoder.h | 2 | ||||
-rw-r--r-- | include/FLAC/stream_encoder.h | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h index 9d18ed75..a921653c 100644 --- a/include/FLAC++/decoder.h +++ b/include/FLAC++/decoder.h @@ -156,7 +156,7 @@ namespace FLAC { virtual bool seek_absolute(FLAC__uint64 sample); ///< See FLAC__stream_decoder_seek_absolute() protected: /// see FLAC__StreamDecoderReadCallback - virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes) = 0; + virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes) = 0; /// see FLAC__StreamDecoderSeekCallback virtual ::FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset); @@ -188,7 +188,7 @@ namespace FLAC { ::FLAC__StreamDecoder *decoder_; - static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); + static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); static ::FLAC__StreamDecoderSeekStatus seek_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data); static ::FLAC__StreamDecoderTellStatus tell_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data); static ::FLAC__StreamDecoderLengthStatus length_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data); @@ -234,7 +234,7 @@ namespace FLAC { virtual ::FLAC__StreamDecoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_decoder_init_ogg_file() protected: // this is a dummy implementation to satisfy the pure virtual in Stream that is actually supplied internally by the C layer - virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes); + virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes); private: // Private and undefined so you can't use them: File(const File &); diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h index b974cc42..a5060b49 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -177,7 +177,7 @@ namespace FLAC { virtual bool process_interleaved(const FLAC__int32 buffer[], unsigned samples); ///< See FLAC__stream_encoder_process_interleaved() protected: /// See FLAC__StreamEncoderReadCallback - virtual ::FLAC__StreamEncoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes); + virtual ::FLAC__StreamEncoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes); /// See FLAC__StreamEncoderWriteCallback virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; @@ -200,7 +200,7 @@ namespace FLAC { ::FLAC__StreamEncoder *encoder_; - static ::FLAC__StreamEncoderReadStatus read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); + static ::FLAC__StreamEncoderReadStatus read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data); static ::FLAC__StreamEncoderWriteStatus write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data); static ::FLAC__StreamEncoderSeekStatus seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data); static ::FLAC__StreamEncoderTellStatus tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data); diff --git a/include/FLAC/all.h b/include/FLAC/all.h index a5672f23..65a75484 100644 --- a/include/FLAC/all.h +++ b/include/FLAC/all.h @@ -312,6 +312,10 @@ * two new convenience functions that may be useful: * FLAC__metadata_object_cuesheet_calculate_cddb_id() and * FLAC__metadata_get_cuesheet(). + * + * The \a bytes parameter to FLAC__StreamDecoderReadCallback and + * FLAC__StreamEncoderReadCallback is now \c size_t instead of + * \c unsigned. */ /** \defgroup flac FLAC C API diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h index d076e5be..41b78bec 100644 --- a/include/FLAC/stream_decoder.h +++ b/include/FLAC/stream_decoder.h @@ -493,7 +493,7 @@ typedef struct { * \retval FLAC__StreamDecoderReadStatus * The callee's return status. */ -typedef FLAC__StreamDecoderReadStatus (*FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +typedef FLAC__StreamDecoderReadStatus (*FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); /** Signature for the seek callback. * diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h index ad2f5002..3851fc34 100644 --- a/include/FLAC/stream_encoder.h +++ b/include/FLAC/stream_encoder.h @@ -484,7 +484,7 @@ typedef struct { * \retval FLAC__StreamEncoderReadStatus * The callee's return status. */ -typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data); /** Signature for the write callback. * |