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

minor syntax

Browse Source
This commit is contained in:
Josh Coalson
2003-09-26 01:46:21 +00:00
parent 069a58bbe0
commit 4e96cdbb7b
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/OggFLAC/file_decoder.h
View File

@@ -453,7 +453,7 @@ OggFLAC_API FLAC__StreamDecoderState OggFLAC__file_decoder_get_FLAC_stream_decod
* \retval const char * * \retval const char *
* The decoder state as a C string. Do not modify the contents. * 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 /** This is inherited from FLAC__FileDecoder; see
* FLAC__file_decoder_get_md5_checking(). * FLAC__file_decoder_get_md5_checking().

2
include/OggFLAC/seekable_stream_decoder.h
View File

@@ -583,7 +583,7 @@ OggFLAC_API FLAC__StreamDecoderState OggFLAC__seekable_stream_decoder_get_FLAC_s
* \retval const char * * \retval const char *
* The decoder state as a C string. Do not modify the contents. * 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 /** This is inherited from FLAC__SeekableStreamDecoder; see
* FLAC__seekable_stream_decoder_get_md5_checking(). * FLAC__seekable_stream_decoder_get_md5_checking().

5
src/libFLAC/file_encoder.c
View File

@@ -31,10 +31,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> /* for malloc() */ #include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy() */ #include <string.h> /* for strlen(), strcpy() */
#include "FLAC/assert.h" #include "FLAC/assert.h"
#include "protected/file_encoder.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; 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; FLAC__FileEncoder *file_encoder = (FLAC__FileEncoder*)client_data;
long offset; long offset;

2
src/libOggFLAC/file_decoder.c
View File

@@ -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); 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);
FLAC__ASSERT(0 != decoder->private_); FLAC__ASSERT(0 != decoder->private_);

2
src/libOggFLAC/include/private/ogg_decoder_aspect.h
View File

@@ -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_flush(OggFLAC__OggDecoderAspect *aspect);
void OggFLAC__ogg_decoder_aspect_reset(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 { typedef enum {
OggFLAC__OGG_DECODER_ASPECT_READ_STATUS_OK = 0, OggFLAC__OGG_DECODER_ASPECT_READ_STATUS_OK = 0,

2
src/libOggFLAC/ogg_decoder_aspect.c
View File

@@ -82,7 +82,7 @@ void OggFLAC__ogg_decoder_aspect_flush(OggFLAC__OggDecoderAspect *aspect)
void OggFLAC__ogg_decoder_aspect_reset(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); (void)ogg_sync_reset(&aspect->sync_state);
} }

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

@@ -1642,7 +1642,7 @@ static bool test_file_decoder()
printf("OK\n"); printf("OK\n");
printf("testing init()... "); printf("testing init()... ");
if(decoder->init() != ::FLAC__SEEKABLE_STREAM_DECODER_OK) if(decoder->init() != ::FLAC__FILE_DECODER_OK)
return decoder->die(); return decoder->die();
printf("OK\n"); printf("OK\n");