minor syntax

diff --git a/src/flac/encode.c b/src/flac/encode.c
index 3768c3dafe19ca0536c9104ba5fea5fb4760a84d..e1f5ecc7f3507263cbf9cdf41e85bd1db99755a8 100644 (file)
--- a/src/flac/encode.c
+++ b/src/flac/encode.c
@@ -1512,13 +1512,13 @@ FLAC__StreamEncoderWriteStatus write_callback(const FLAC__StreamEncoder *encoder
                if(encoder_wrapper->verify_fifo.into_frames) {
                        if(!FLAC__stream_decoder_process_one_frame(encoder_wrapper->verify_fifo.decoder)) {
                                encoder_wrapper->verify_fifo.result = FLAC__VERIFY_FAILED_IN_FRAME;
-                               return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+                               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
                        }
                }
                else {
                        if(!FLAC__stream_decoder_process_metadata(encoder_wrapper->verify_fifo.decoder)) {
                                encoder_wrapper->verify_fifo.result = FLAC__VERIFY_FAILED_IN_METADATA;
-                               return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+                               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
                        }
                }
        }
@@ -1550,22 +1550,22 @@ FLAC__StreamEncoderWriteStatus write_callback(const FLAC__StreamEncoder *encoder
                        int written;
                        written = fwrite(encoder_wrapper->ogg.og.header, 1, encoder_wrapper->ogg.og.header_len, encoder_wrapper->fout);
                        if (written != encoder_wrapper->ogg.og.header_len)
-                               return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+                               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 
                        written = fwrite(encoder_wrapper->ogg.og.body, 1, encoder_wrapper->ogg.og.body_len, encoder_wrapper->fout);
                        if (written != encoder_wrapper->ogg.og.body_len)
-                               return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+                               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
                }
 
-               return FLAC__STREAM_ENCODER_WRITE_OK;
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
        }
        else
 #endif
        {
                if(fwrite(buffer, sizeof(FLAC__byte), bytes, encoder_wrapper->fout) == bytes)
-                       return FLAC__STREAM_ENCODER_WRITE_OK;
+                       return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
                else
-                       return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+                       return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
        }
 }
 

diff --git a/src/test_libFLAC++/encoders.cc b/src/test_libFLAC++/encoders.cc
index 7b7dc3459764203d5e8846b3c761ca35c21e5268..047f62cff6a318436bc99ec60c6ab0d72519dc50 100644 (file)
--- a/src/test_libFLAC++/encoders.cc
+++ b/src/test_libFLAC++/encoders.cc
@@ -133,7 +133,7 @@ public:
 {
        (void)buffer, (void)bytes, (void)samples, (void)current_frame;
 
-       return ::FLAC__STREAM_ENCODER_WRITE_OK;
+       return ::FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
 void StreamEncoder::metadata_callback(const ::FLAC__StreamMetadata *metadata)

diff --git a/src/test_libFLAC++/file_utils.c b/src/test_libFLAC++/file_utils.c
index e7fb6a9a8faa10d5cdb5730fe8e7697ceae6c345..a460d4ba1d68f21d6d824c5d71078a3eacff185d 100644 (file)
--- a/src/test_libFLAC++/file_utils.c
+++ b/src/test_libFLAC++/file_utils.c
@@ -46,9 +46,9 @@ static FLAC__StreamEncoderWriteStatus encoder_write_callback_(const FLAC__Stream
        (void)encoder, (void)samples, (void)current_frame;
 
        if(fwrite(buffer, 1, bytes, ecd->file) != bytes)
-               return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
        else
-               return FLAC__STREAM_ENCODER_WRITE_OK;
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
 static void encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)