From 2835f433b39ea29a13fef6d384ac3c9540db3b22 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 4 Jun 2002 05:54:44 +0000 Subject: [PATCH] fix with new status enums --- src/libFLAC/metadata_iterators.c | 4 ++-- src/test_unit/metadata_manip.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index 8fc4e51..875b000 100644 --- 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 381e87b..2a8d95f 100644 --- 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; -- 2.7.4