minor syntax

diff --git a/include/OggFLAC/file_decoder.h b/include/OggFLAC/file_decoder.h
index a510744057f164e256938f5b831865bd58ac66ee..093d28bc98bddec2d00f71addc7c7cb877e91080 100644 (file)
--- 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 fae181ea3a28b568245fab109eb36c7824badcfc..e668ceb9c0f662c3d51c387205899df1fba69959 100644 (file)
--- 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 98a813267573c7450e4d07455142672bc30186dc..266b690c301e0b7024410ac3890d52f830ab228a 100644 (file)
--- a/src/libFLAC/file_encoder.c
+++ b/src/libFLAC/file_encoder.c
@@ -31,10 +31,9 @@
 
 #include <stdio.h>
 #include <stdlib.h> /* for malloc() */
-#include <string.h> /* for memcpy() */
+#include <string.h> /* 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 c65ac863346b21178b68d8bb242c407429ed6cf3..492df0d85caf0686e49d4deab7d0276679b8db5d 100644 (file)
--- 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 1f535f14d07e1ed44d4ddf393ec319dd5fbb5a92..719a4b16f3fcb0073c770c4e696143a5aab98aa4 100644 (file)
--- 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 970c734b68a46b4813c705596f8e638c87ff9b54..26824b259bb0fd62e495ebb0b478a43aa82c96f6 100644 (file)
--- 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 881562b81afdee0f8453ee916749995c9d5d3ab5..228ac805ad9932846361e740ffb2b55a3069041c 100644 (file)
--- 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");