claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

better state reporting

Browse Source
This commit is contained in:
Josh Coalson
2002-08-03 22:01:35 +00:00
parent d86e03bc63
commit 189267013e
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test_libFLAC++/decoders.cc
View File

@@ -271,9 +271,11 @@ bool StreamDecoder::die(const char *msg) const
State state = get_state(); State state = get_state();
if(msg) if(msg)
printf("FAILED, %s, state = %u (%s)\n", msg, (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring()); printf("FAILED, %s", msg);
else else
printf("FAILED, state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring()); printf("FAILED");
printf(", state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring());
return false; return false;
} }
@@ -945,9 +947,15 @@ bool SeekableStreamDecoder::die(const char *msg) const
State state = get_state(); State state = get_state();
if(msg) if(msg)
printf("FAILED, %s, state = %u (%s)\n", msg, (unsigned)((::FLAC__SeekableStreamDecoderState)state), state.as_cstring()); printf("FAILED, %s", msg);
else else
printf("FAILED, state = %u (%s)\n", (unsigned)((::FLAC__SeekableStreamDecoderState)state), state.as_cstring()); printf("FAILED");
printf(", state = %u (%s)\n", (unsigned)((::FLAC__SeekableStreamDecoderState)state), state.as_cstring());
if(state == ::FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
FLAC::Decoder::Stream::State state_ = get_stream_decoder_state();
printf(" stream decoder state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state_), state_.as_cstring());
}
return false; return false;
} }
@@ -1581,9 +1589,19 @@ bool FileDecoder::die(const char *msg) const
State state = get_state(); State state = get_state();
if(msg) if(msg)
printf("FAILED, %s, state = %u (%s)\n", msg, (unsigned)((::FLAC__FileDecoderState)state), state.as_cstring()); printf("FAILED, %s", msg);
else else
printf("FAILED, state = %u (%s)\n", (unsigned)((::FLAC__FileDecoderState)state), state.as_cstring()); printf("FAILED");
printf(", state = %u (%s)\n", (unsigned)((::FLAC__FileDecoderState)state), state.as_cstring());
if(state == ::FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR) {
FLAC::Decoder::SeekableStream::State state_ = get_seekable_stream_decoder_state();
printf(" seekable stream decoder state = %u (%s)\n", (unsigned)((::FLAC__SeekableStreamDecoderState)state_), state_.as_cstring());
if(state_ == ::FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
FLAC::Decoder::Stream::State state__ = get_stream_decoder_state();
printf(" stream decoder state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state__), state__.as_cstring());
}
}
return false; return false;
} }

4
src/test_libFLAC/decoders.c
View File

@@ -76,7 +76,7 @@ static FLAC__bool die_ss_(const char *msg, const FLAC__SeekableStreamDecoder *de
printf(", state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamDecoderStateString[state]); printf(", state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamDecoderStateString[state]);
if(state == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) { if(state == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
FLAC__StreamDecoderState state_ = FLAC__seekable_stream_decoder_get_stream_decoder_state(decoder); FLAC__StreamDecoderState state_ = FLAC__seekable_stream_decoder_get_stream_decoder_state(decoder);
printf(" stream decoder state = %u (%s)\n", (unsigned)state, FLAC__StreamDecoderStateString[state_]); printf(" stream decoder state = %u (%s)\n", (unsigned)state_, FLAC__StreamDecoderStateString[state_]);
} }
return false; return false;
@@ -97,7 +97,7 @@ static FLAC__bool die_f_(const char *msg, const FLAC__FileDecoder *decoder)
printf(" seekable stream decoder state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamDecoderStateString[state_]); printf(" seekable stream decoder state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamDecoderStateString[state_]);
if(state_ == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) { if(state_ == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
FLAC__StreamDecoderState state__ = FLAC__file_decoder_get_stream_decoder_state(decoder); FLAC__StreamDecoderState state__ = FLAC__file_decoder_get_stream_decoder_state(decoder);
printf(" stream decoder state = %u (%s)\n", (unsigned)state, FLAC__StreamDecoderStateString[state__]); printf(" stream decoder state = %u (%s)\n", (unsigned)state__, FLAC__StreamDecoderStateString[state__]);
} }
} }