fix with new status enums

diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
index 8fc4e51e7dcb6407e2280a73fe73086cb8ae7feb..875b000949c527eaa361965848a087753288bff2 100644 (file)
--- a/src/libFLAC/metadata_iterators.c
+++ b/src/libFLAC/metadata_iterators.c
@@ -145,7 +145,7 @@ FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder,
 {
        (void)decoder, (void)frame, (void)buffer, (void)client_data;
 
-       return FLAC__STREAM_DECODER_WRITE_CONTINUE;
+       return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
 void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data)
@@ -162,7 +162,7 @@ void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorS
        FLAC__StreamMetaData_StreamInfo **streaminfo = (FLAC__StreamMetaData_StreamInfo **)client_data;
        (void)decoder;
 
-       if(status != FLAC__STREAM_DECODER_ERROR_LOST_SYNC)
+       if(status != FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC)
                *streaminfo = 0;
 }
 

diff --git a/src/test_unit/metadata_manip.c b/src/test_unit/metadata_manip.c
index 381e87bc6ba71cad28bbf213c48c7f96b4c5478b..2a8d95f28cd4e04a55768149ac21a155c982fa7e 100644 (file)
--- a/src/test_unit/metadata_manip.c
+++ b/src/test_unit/metadata_manip.c
@@ -211,7 +211,7 @@ static FLAC__StreamDecoderWriteStatus decoder_write_callback_(const FLAC__FileDe
                fflush(stdout);
        }
 
-       return FLAC__STREAM_DECODER_WRITE_CONTINUE;
+       return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
 static void decoder_error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
@@ -293,7 +293,7 @@ static FLAC__bool generate_file_()
        if(!insert_to_our_metadata_(&streaminfo, 0, /*copy=*/true) || !insert_to_our_metadata_(&padding, 1, /*copy=*/true))
                return die_("priming our metadata");
 
-       if(!file_utils__generate_flacfile(flacfile_, 512 * 1024, &streaminfo, metadata, 1))
+       if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
                return die_("creating the encoded file"); 
 
        return true;