change "bytes" parameter of all encoder write callbacks from "unsigned" to "size_t"

[platform/upstream/flac.git] / src / libFLAC++ / stream_encoder.cpp

diff --git a/src/libFLAC++/stream_encoder.cpp b/src/libFLAC++/stream_encoder.cpp
index c0aca1b..cd17a76 100644 (file)
--- a/src/libFLAC++/stream_encoder.cpp
+++ b/src/libFLAC++/stream_encoder.cpp
@@ -74,10 +74,10 @@ namespace FLAC {
                        return 0 != encoder_;
                }
 
-               bool Stream::set_serial_number(long value)
+               bool Stream::set_ogg_serial_number(long value)
                {
                        FLAC__ASSERT(is_valid());
-                       return (bool)::FLAC__stream_encoder_set_serial_number(encoder_, value);
+                       return (bool)::FLAC__stream_encoder_set_ogg_serial_number(encoder_, value);
                }
 
                bool Stream::set_verify(bool value)
@@ -369,7 +369,7 @@ namespace FLAC {
                        return (bool)::FLAC__stream_encoder_process_interleaved(encoder_, buffer, samples);
                }
 
-               ::FLAC__StreamEncoderReadStatus Stream::read_callback(FLAC__byte buffer[], unsigned *bytes)
+               ::FLAC__StreamEncoderReadStatus Stream::read_callback(FLAC__byte buffer[], size_t *bytes)
                {
                        (void)buffer, (void)bytes;
                        return ::FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED;
@@ -392,7 +392,7 @@ namespace FLAC {
                        (void)metadata;
                }
 
-               ::FLAC__StreamEncoderReadStatus Stream::read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+               ::FLAC__StreamEncoderReadStatus Stream::read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
                {
                        (void)encoder;
                        FLAC__ASSERT(0 != client_data);
@@ -401,7 +401,7 @@ namespace FLAC {
                        return instance->read_callback(buffer, bytes);
                }
 
-               ::FLAC__StreamEncoderWriteStatus Stream::write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+               ::FLAC__StreamEncoderWriteStatus Stream::write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
                {
                        (void)encoder;
                        FLAC__ASSERT(0 != client_data);
@@ -490,7 +490,7 @@ namespace FLAC {
                // with FLAC__stream_decoder_init_FILE() or
                // FLAC__stream_decoder_init_file() and those supply the read
                // callback internally.
-               ::FLAC__StreamEncoderWriteStatus File::write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame)
+               ::FLAC__StreamEncoderWriteStatus File::write_callback(const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)
                {
                        (void)buffer, (void)bytes, (void)samples, (void)current_frame;
                        FLAC__ASSERT(false);