From 4e96cdbb7bef69ca513c5c8f04315d93564fb16b Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 26 Sep 2003 01:46:21 +0000 Subject: [PATCH] minor syntax --- include/OggFLAC/file_decoder.h | 2 +- include/OggFLAC/seekable_stream_decoder.h | 2 +- src/libFLAC/file_encoder.c | 5 ++--- src/libOggFLAC/file_decoder.c | 2 +- src/libOggFLAC/include/private/ogg_decoder_aspect.h | 2 +- src/libOggFLAC/ogg_decoder_aspect.c | 2 +- src/test_libFLAC++/decoders.cpp | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/OggFLAC/file_decoder.h b/include/OggFLAC/file_decoder.h index a5107440..093d28bc 100644 --- a/include/OggFLAC/file_decoder.h +++ b/include/OggFLAC/file_decoder.h @@ -453,7 +453,7 @@ OggFLAC_API FLAC__StreamDecoderState OggFLAC__file_decoder_get_FLAC_stream_decod * \retval const char * * The decoder state as a C string. Do not modify the contents. */ -OggFLAC_API const char *FLAC__file_decoder_get_resolved_state_string(const FLAC__FileDecoder *decoder); +OggFLAC_API const char *OggFLAC__file_decoder_get_resolved_state_string(const OggFLAC__FileDecoder *decoder); /** This is inherited from FLAC__FileDecoder; see * FLAC__file_decoder_get_md5_checking(). diff --git a/include/OggFLAC/seekable_stream_decoder.h b/include/OggFLAC/seekable_stream_decoder.h index fae181ea..e668ceb9 100644 --- a/include/OggFLAC/seekable_stream_decoder.h +++ b/include/OggFLAC/seekable_stream_decoder.h @@ -583,7 +583,7 @@ OggFLAC_API FLAC__StreamDecoderState OggFLAC__seekable_stream_decoder_get_FLAC_s * \retval const char * * The decoder state as a C string. Do not modify the contents. */ -OggFLAC_API const char *FLAC__seekable_stream_decoder_get_resolved_state_string(const FLAC__SeekableStreamDecoder *decoder); +OggFLAC_API const char *OggFLAC__seekable_stream_decoder_get_resolved_state_string(const OggFLAC__SeekableStreamDecoder *decoder); /** This is inherited from FLAC__SeekableStreamDecoder; see * FLAC__seekable_stream_decoder_get_md5_checking(). diff --git a/src/libFLAC/file_encoder.c b/src/libFLAC/file_encoder.c index 98a81326..266b690c 100644 --- a/src/libFLAC/file_encoder.c +++ b/src/libFLAC/file_encoder.c @@ -31,10 +31,9 @@ #include #include /* for malloc() */ -#include /* for memcpy() */ +#include /* for strlen(), strcpy() */ #include "FLAC/assert.h" #include "protected/file_encoder.h" -#include "protected/seekable_stream_encoder.h" /*********************************************************************** * @@ -713,7 +712,7 @@ FLAC__SeekableStreamEncoderSeekStatus seek_callback_(const FLAC__SeekableStreamE return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; } -FLAC__SeekableStreamEncoderSeekStatus tell_callback_(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) +FLAC__SeekableStreamEncoderTellStatus tell_callback_(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) { FLAC__FileEncoder *file_encoder = (FLAC__FileEncoder*)client_data; long offset; diff --git a/src/libOggFLAC/file_decoder.c b/src/libOggFLAC/file_decoder.c index c65ac863..492df0d8 100644 --- a/src/libOggFLAC/file_decoder.c +++ b/src/libOggFLAC/file_decoder.c @@ -422,7 +422,7 @@ OggFLAC_API FLAC__bool OggFLAC__file_decoder_process_until_end_of_metadata(OggFL return FLAC__file_decoder_process_until_end_of_metadata(decoder->private_->FLAC_file_decoder); } -OggFLAC_API FLAC__bool OggFLAC__filfiless_until_end_of_file(OggFLAC__FileDecoder *decoder) +OggFLAC_API FLAC__bool OggFLAC__file_decoder_process_until_end_of_file(OggFLAC__FileDecoder *decoder) { FLAC__ASSERT(0 != decoder); FLAC__ASSERT(0 != decoder->private_); diff --git a/src/libOggFLAC/include/private/ogg_decoder_aspect.h b/src/libOggFLAC/include/private/ogg_decoder_aspect.h index 1f535f14..719a4b16 100644 --- a/src/libOggFLAC/include/private/ogg_decoder_aspect.h +++ b/src/libOggFLAC/include/private/ogg_decoder_aspect.h @@ -55,7 +55,7 @@ void OggFLAC__ogg_decoder_aspect_finish(OggFLAC__OggDecoderAspect *aspect); void OggFLAC__ogg_decoder_aspect_flush(OggFLAC__OggDecoderAspect *aspect); void OggFLAC__ogg_decoder_aspect_reset(OggFLAC__OggDecoderAspect *aspect); -typedef FLAC__StreamDecoderReadStatus (*OggFLAC__OggDecoderAspectReadCallbackProxy)(void *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +typedef FLAC__StreamDecoderReadStatus (*OggFLAC__OggDecoderAspectReadCallbackProxy)(const void *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); typedef enum { OggFLAC__OGG_DECODER_ASPECT_READ_STATUS_OK = 0, diff --git a/src/libOggFLAC/ogg_decoder_aspect.c b/src/libOggFLAC/ogg_decoder_aspect.c index 970c734b..26824b25 100644 --- a/src/libOggFLAC/ogg_decoder_aspect.c +++ b/src/libOggFLAC/ogg_decoder_aspect.c @@ -82,7 +82,7 @@ void OggFLAC__ogg_decoder_aspect_flush(OggFLAC__OggDecoderAspect *aspect) void OggFLAC__ogg_decoder_aspect_reset(OggFLAC__OggDecoderAspect *aspect) { - (void)ogg_stream_reset(&aspect->sync_state); + (void)ogg_stream_reset(&aspect->stream_state); (void)ogg_sync_reset(&aspect->sync_state); } diff --git a/src/test_libFLAC++/decoders.cpp b/src/test_libFLAC++/decoders.cpp index 881562b8..228ac805 100644 --- a/src/test_libFLAC++/decoders.cpp +++ b/src/test_libFLAC++/decoders.cpp @@ -1642,7 +1642,7 @@ static bool test_file_decoder() printf("OK\n"); printf("testing init()... "); - if(decoder->init() != ::FLAC__SEEKABLE_STREAM_DECODER_OK) + if(decoder->init() != ::FLAC__FILE_DECODER_OK) return decoder->die(); printf("OK\n");