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

fix FLAC::Decoder::Stream::finish() to return a bool like its C cousin

Browse Source
This commit is contained in:
Josh Coalson
2006-11-09 06:55:21 +00:00
parent 4c5d485b1d
commit 38bf3e6ca9
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/FLAC++/decoder.h
View File

@@ -143,7 +143,7 @@ namespace FLAC {
virtual ::FLAC__StreamDecoderInitStatus init(); ///< Seek FLAC__stream_decoder_init_stream() virtual ::FLAC__StreamDecoderInitStatus init(); ///< Seek FLAC__stream_decoder_init_stream()
virtual ::FLAC__StreamDecoderInitStatus init_ogg(); ///< Seek FLAC__stream_decoder_init_ogg_stream() virtual ::FLAC__StreamDecoderInitStatus init_ogg(); ///< Seek FLAC__stream_decoder_init_ogg_stream()
virtual void finish(); ///< See FLAC__stream_decoder_finish() virtual bool finish(); ///< See FLAC__stream_decoder_finish()
virtual bool flush(); ///< See FLAC__stream_decoder_flush() virtual bool flush(); ///< See FLAC__stream_decoder_flush()
virtual bool reset(); ///< See FLAC__stream_decoder_reset() virtual bool reset(); ///< See FLAC__stream_decoder_reset()

6
src/libFLAC++/stream_decoder.cpp
View File

@@ -53,7 +53,7 @@ namespace FLAC {
Stream::~Stream() Stream::~Stream()
{ {
if(0 != decoder_) { if(0 != decoder_) {
::FLAC__stream_decoder_finish(decoder_); (void)::FLAC__stream_decoder_finish(decoder_);
::FLAC__stream_decoder_delete(decoder_); ::FLAC__stream_decoder_delete(decoder_);
} }
} }
@@ -171,10 +171,10 @@ namespace FLAC {
return ::FLAC__stream_decoder_init_ogg_stream(decoder_, read_callback_, seek_callback_, tell_callback_, length_callback_, eof_callback_, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this); return ::FLAC__stream_decoder_init_ogg_stream(decoder_, read_callback_, seek_callback_, tell_callback_, length_callback_, eof_callback_, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
} }
void Stream::finish() bool Stream::finish()
{ {
FLAC__ASSERT(is_valid()); FLAC__ASSERT(is_valid());
::FLAC__stream_decoder_finish(decoder_); return (bool)::FLAC__stream_decoder_finish(decoder_);
} }
bool Stream::flush() bool Stream::flush()

18
src/test_libFLAC++/decoders.cpp
View File

@@ -332,7 +332,11 @@ bool StreamDecoder::test_respond(bool is_ogg)
printf("OK\n"); printf("OK\n");
printf("testing finish()... "); printf("testing finish()... ");
finish(); if(!finish()) {
State state = get_state();
printf("FAILED, returned false, state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring());
return false;
}
printf("OK\n"); printf("OK\n");
return true; return true;
@@ -414,7 +418,11 @@ bool FileDecoder::test_respond(bool is_ogg)
printf("OK\n"); printf("OK\n");
printf("testing finish()... "); printf("testing finish()... ");
finish(); if(!finish()) {
State state = get_state();
printf("FAILED, returned false, state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring());
return false;
}
printf("OK\n"); printf("OK\n");
return true; return true;
@@ -714,7 +722,11 @@ static bool test_stream_decoder(Layer layer, bool is_ogg)
} }
printf("testing finish()... "); printf("testing finish()... ");
decoder->finish(); if(!decoder->finish()) {
FLAC::Decoder::Stream::State state = decoder->get_state();
printf("FAILED, returned false, state = %u (%s)\n", (unsigned)((::FLAC__StreamDecoderState)state), state.as_cstring());
return false;
}
printf("OK\n"); printf("OK\n");
/* /*