From: Josh Coalson Date: Wed, 24 Sep 2003 22:10:51 +0000 (+0000) Subject: use resolved_state_string as much as possible X-Git-Tag: 1.2.0~1014 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=807140daab9aef3cc3ef3b9031c3b6a51d36b04c;p=platform%2Fupstream%2Fflac.git use resolved_state_string as much as possible --- diff --git a/src/libFLAC/seekable_stream_decoder.c b/src/libFLAC/seekable_stream_decoder.c index 3cea37b..7cc074d 100644 --- a/src/libFLAC/seekable_stream_decoder.c +++ b/src/libFLAC/seekable_stream_decoder.c @@ -470,7 +470,7 @@ FLAC_API const char *FLAC__seekable_stream_decoder_get_resolved_state_string(con if(decoder->protected_->state != FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) return FLAC__SeekableStreamDecoderStateString[decoder->protected_->state]; else - return FLAC__StreamDecoderStateString[FLAC__stream_decoder_get_state(decoder->private_->stream_decoder)]; + return FLAC__stream_decoder_get_resolved_state_string(decoder->private_->stream_decoder); } FLAC_API FLAC__bool FLAC__seekable_stream_decoder_get_md5_checking(const FLAC__SeekableStreamDecoder *decoder) diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 7029e56..f346f72 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -1203,7 +1203,7 @@ FLAC_API const char *FLAC__stream_encoder_get_resolved_state_string(const FLAC__ if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) return FLAC__StreamEncoderStateString[encoder->protected_->state]; else - return FLAC__StreamDecoderStateString[FLAC__stream_decoder_get_state(encoder->private_->verify.decoder)]; + return FLAC__stream_decoder_get_resolved_state_string(encoder->private_->verify.decoder); } FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got) diff --git a/src/libOggFLAC/stream_decoder.c b/src/libOggFLAC/stream_decoder.c index 6736193..1046eb6 100644 --- a/src/libOggFLAC/stream_decoder.c +++ b/src/libOggFLAC/stream_decoder.c @@ -30,7 +30,6 @@ */ #include /* for calloc() */ -#include /* for memset() */ #include "FLAC/assert.h" #include "protected/stream_decoder.h" @@ -334,7 +333,7 @@ OggFLAC_API const char *OggFLAC__stream_decoder_get_resolved_state_string(const if(decoder->protected_->state != OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR) return OggFLAC__StreamDecoderStateString[decoder->protected_->state]; else - return FLAC__StreamDecoderStateString[FLAC__stream_decoder_get_state(decoder->private_->FLAC_stream_decoder)]; + return FLAC__stream_decoder_get_resolved_state_string(decoder->private_->FLAC_stream_decoder); } OggFLAC_API unsigned OggFLAC__stream_decoder_get_channels(const OggFLAC__StreamDecoder *decoder)