AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor syntax

Browse Source
This commit is contained in:
Josh Coalson 2002-08-01 08:09:14 +00:00
parent 312438fc61
commit 8255be52c3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/flac/encode.c
View File

@ -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;
}
}

2
src/test_libFLAC++/encoders.cc
View File

@ -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)

4
src/test_libFLAC++/file_utils.c
View File

@ -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)