rename set_serial_number to set_ogg_serial_number everywhere

diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h
index 49fa0fe..8537f99 100644 (file)
--- a/include/FLAC++/decoder.h
+++ b/include/FLAC++/decoder.h
@@ -129,7 +129,7 @@ namespace FLAC {
                        inline operator bool() const { return is_valid(); }
                        //@}
 
-                       virtual bool set_serial_number(long value);                            ///< See FLAC__stream_decoder_set_serial_number()
+                       virtual bool set_ogg_serial_number(long value);                        ///< See FLAC__stream_decoder_set_ogg_serial_number()
                        virtual bool set_md5_checking(bool value);                             ///< See FLAC__stream_decoder_set_md5_checking()
                        virtual bool set_metadata_respond(::FLAC__MetadataType type);          ///< See FLAC__stream_decoder_set_metadata_respond()
                        virtual bool set_metadata_respond_application(const FLAC__byte id[4]); ///< See FLAC__stream_decoder_set_metadata_respond_application()

diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h
index 327cd6a..d506dc1 100644 (file)
--- a/include/FLAC++/encoder.h
+++ b/include/FLAC++/encoder.h
@@ -132,7 +132,7 @@ namespace FLAC {
                        inline operator bool() const { return is_valid(); }
                        //@}
 
-                       virtual bool set_serial_number(long value);                     ///< See FLAC__stream_encoder_set_serial_number()
+                       virtual bool set_ogg_serial_number(long value);                 ///< See FLAC__stream_encoder_set_ogg_serial_number()
                        virtual bool set_verify(bool value);                            ///< See FLAC__stream_encoder_set_verify()
                        virtual bool set_streamable_subset(bool value);                 ///< See FLAC__stream_encoder_set_streamable_subset()
                        virtual bool set_do_mid_side_stereo(bool value);                ///< See FLAC__stream_encoder_set_do_mid_side_stereo()

diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
index 06ba1b2..2b21c8c 100644 (file)
--- a/include/FLAC/stream_decoder.h
+++ b/include/FLAC/stream_decoder.h
@@ -680,7 +680,7 @@ FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder);
  * \retval FLAC__bool
  *    \c false if the decoder is already initialized, else \c true.
  */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_serial_number(FLAC__StreamDecoder *decoder, long serial_number);
+FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number);
 
 /** Set the "MD5 signature checking" flag.  If \c true, the decoder will
  *  compute the MD5 signature of the unencoded audio data while decoding

diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h
index 85a2b46..5aba79f 100644 (file)
--- a/include/FLAC/stream_encoder.h
+++ b/include/FLAC/stream_encoder.h
@@ -651,7 +651,7 @@ FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder);
  * \retval FLAC__bool
  *    \c false if the encoder is already initialized, else \c true.
  */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_serial_number(FLAC__StreamEncoder *encoder, long serial_number);
+FLAC_API FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long serial_number);
 
 /** Set the "verify" flag.  If \c true, the encoder will verify it's own
  *  encoded output by feeding it through an internal decoder and comparing

diff --git a/src/flac/decode.c b/src/flac/decode.c
index 157e060..113f9be 100644 (file)
--- a/src/flac/decode.c
+++ b/src/flac/decode.c
@@ -335,7 +335,7 @@ FLAC__bool DecoderSession_init_decoder(DecoderSession *decoder_session, decode_o
 #ifdef FLAC__HAS_OGG
        if(decoder_session->is_ogg) {
                if(!decode_options.use_first_serial_number)
-                       FLAC__stream_decoder_set_serial_number(decoder_session->decoder, decode_options.serial_number);
+                       FLAC__stream_decoder_set_ogg_serial_number(decoder_session->decoder, decode_options.serial_number);
                init_status = FLAC__stream_decoder_init_ogg_file(decoder_session->decoder, strcmp(infilename, "-")? infilename : 0, write_callback, metadata_callback, error_callback, /*client_data=*/decoder_session);
        }
        else

diff --git a/src/flac/encode.c b/src/flac/encode.c
index fa414f1..6bf0d22 100644 (file)
--- a/src/flac/encode.c
+++ b/src/flac/encode.c
@@ -1920,7 +1920,7 @@ FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t optio
 
 #ifdef FLAC__HAS_OGG
        if(e->use_ogg) {
-               FLAC__stream_encoder_set_serial_number(e->encoder, options.serial_number);
+               FLAC__stream_encoder_set_ogg_serial_number(e->encoder, options.serial_number);
 
                init_status = FLAC__stream_encoder_init_ogg_file(e->encoder, e->is_stdout? 0 : e->outfilename, encoder_progress_callback, /*client_data=*/e);
        }

diff --git a/src/libFLAC++/stream_decoder.cpp b/src/libFLAC++/stream_decoder.cpp
index d20a8a0..20e7731 100644 (file)
--- a/src/libFLAC++/stream_decoder.cpp
+++ b/src/libFLAC++/stream_decoder.cpp
@@ -73,10 +73,10 @@ namespace FLAC {
                        return 0 != decoder_;
                }
 
-               bool Stream::set_serial_number(long value)
+               bool Stream::set_ogg_serial_number(long value)
                {
                        FLAC__ASSERT(is_valid());
-                       return (bool)::FLAC__stream_decoder_set_serial_number(decoder_, value);
+                       return (bool)::FLAC__stream_decoder_set_ogg_serial_number(decoder_, value);
                }
 
                bool Stream::set_md5_checking(bool value)

diff --git a/src/libFLAC++/stream_encoder.cpp b/src/libFLAC++/stream_encoder.cpp
index c0aca1b..867042e 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)

diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index ad20329..94ea270 100644 (file)
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -721,7 +721,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder)
        return !md5_failed;
 }
 
-FLAC_API FLAC__bool FLAC__stream_decoder_set_serial_number(FLAC__StreamDecoder *decoder, long value)
+FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long value)
 {
        FLAC__ASSERT(0 != decoder);
        FLAC__ASSERT(0 != decoder->private_);

diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 2a7a6aa..8c3c990 100644 (file)
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -1370,7 +1370,7 @@ FLAC_API void FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder)
        encoder->protected_->state = FLAC__STREAM_ENCODER_UNINITIALIZED;
 }
 
-FLAC_API FLAC__bool FLAC__stream_encoder_set_serial_number(FLAC__StreamEncoder *encoder, long value)
+FLAC_API FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long value)
 {
        FLAC__ASSERT(0 != encoder);
        FLAC__ASSERT(0 != encoder->private_);

diff --git a/src/test_libFLAC++/decoders.cpp b/src/test_libFLAC++/decoders.cpp
index 2030de9..a4b9e2f 100644 (file)
--- a/src/test_libFLAC++/decoders.cpp
+++ b/src/test_libFLAC++/decoders.cpp
@@ -528,8 +528,8 @@ static bool test_stream_decoder(Layer layer, bool is_ogg)
        printf("OK\n");
 
        if(is_ogg) {
-               printf("testing set_serial_number()... ");
-               if(!decoder->set_serial_number(file_utils__ogg_serial_number))
+               printf("testing set_ogg_serial_number()... ");
+               if(!decoder->set_ogg_serial_number(file_utils__ogg_serial_number))
                        return die_s_("returned false", decoder);
                printf("OK\n");
        }

diff --git a/src/test_libFLAC++/encoders.cpp b/src/test_libFLAC++/encoders.cpp
index 1eaabdd..1221f2d 100644 (file)
--- a/src/test_libFLAC++/encoders.cpp
+++ b/src/test_libFLAC++/encoders.cpp
@@ -185,8 +185,8 @@ static bool test_stream_encoder(Layer layer, bool is_ogg)
        printf("OK\n");
 
        if(is_ogg) {
-               printf("testing set_serial_number()... ");
-               if(!encoder->set_serial_number(file_utils__ogg_serial_number))
+               printf("testing set_ogg_serial_number()... ");
+               if(!encoder->set_ogg_serial_number(file_utils__ogg_serial_number))
                        return die_s_("returned false", encoder);
                printf("OK\n");
        }

diff --git a/src/test_libFLAC/decoders.c b/src/test_libFLAC/decoders.c
index 7aa46ed..c1650b3 100644 (file)
--- a/src/test_libFLAC/decoders.c
+++ b/src/test_libFLAC/decoders.c
@@ -457,8 +457,8 @@ static FLAC__bool test_stream_decoder(Layer layer, FLAC__bool is_ogg)
        printf("OK\n");
 
        if(is_ogg) {
-               printf("testing FLAC__stream_decoder_set_serial_number()... ");
-               if(!FLAC__stream_decoder_set_serial_number(decoder, file_utils__ogg_serial_number))
+               printf("testing FLAC__stream_decoder_set_ogg_serial_number()... ");
+               if(!FLAC__stream_decoder_set_ogg_serial_number(decoder, file_utils__ogg_serial_number))
                        return die_s_("returned false", decoder);
                printf("OK\n");
        }

diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 33ef416..d920069 100644 (file)
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -148,8 +148,8 @@ static FLAC__bool test_stream_encoder(Layer layer, FLAC__bool is_ogg)
        printf("OK\n");
 
        if(is_ogg) {
-               printf("testing FLAC__stream_encoder_set_serial_number()... ");
-               if(!FLAC__stream_encoder_set_serial_number(encoder, file_utils__ogg_serial_number))
+               printf("testing FLAC__stream_encoder_set_ogg_serial_number()... ");
+               if(!FLAC__stream_encoder_set_ogg_serial_number(encoder, file_utils__ogg_serial_number))
                        return die_s_("returned false", encoder);
                printf("OK\n");
        }

diff --git a/src/test_libs_common/file_utils_flac.c b/src/test_libs_common/file_utils_flac.c
index bf73cb7..a45f21c 100644 (file)
--- a/src/test_libs_common/file_utils_flac.c
+++ b/src/test_libs_common/file_utils_flac.c
@@ -89,7 +89,7 @@ FLAC__bool file_utils__generate_flacfile(FLAC__bool is_ogg, const char *output_f
                return false;
        }
 
-       FLAC__stream_encoder_set_serial_number(encoder, file_utils__ogg_serial_number);
+       FLAC__stream_encoder_set_ogg_serial_number(encoder, file_utils__ogg_serial_number);
        FLAC__stream_encoder_set_verify(encoder, true);
        FLAC__stream_encoder_set_streamable_subset(encoder, true);
        FLAC__stream_encoder_set_do_mid_side_stereo(encoder, false);