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

libFLAC: Reduce FLAC__HAS_OGG #ifdef crud

Browse Source
This commit is contained in:
Erik de Castro Lopo
2016-03-20 19:28:41 +11:00
parent eae85ee766
commit 1be4f9537e
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libFLAC/stream_decoder.c
View File

@@ -56,13 +56,7 @@
/* technically this should be in an "export.c" but this is convenient enough */ /* technically this should be in an "export.c" but this is convenient enough */
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = FLAC__HAS_OGG;
#if FLAC__HAS_OGG
1
#else
0
#endif
;
/*********************************************************************** /***********************************************************************
@@ -125,9 +119,7 @@ static FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *c
***********************************************************************/ ***********************************************************************/
typedef struct FLAC__StreamDecoderPrivate { typedef struct FLAC__StreamDecoderPrivate {
#if FLAC__HAS_OGG
FLAC__bool is_ogg; FLAC__bool is_ogg;
#endif
FLAC__StreamDecoderReadCallback read_callback; FLAC__StreamDecoderReadCallback read_callback;
FLAC__StreamDecoderSeekCallback seek_callback; FLAC__StreamDecoderSeekCallback seek_callback;
FLAC__StreamDecoderTellCallback tell_callback; FLAC__StreamDecoderTellCallback tell_callback;
@@ -174,9 +166,7 @@ typedef struct FLAC__StreamDecoderPrivate {
FLAC__uint64 first_frame_offset; /* hint to the seek routine of where in the stream the first audio frame starts */ FLAC__uint64 first_frame_offset; /* hint to the seek routine of where in the stream the first audio frame starts */
FLAC__uint64 target_sample; FLAC__uint64 target_sample;
unsigned unparseable_frame_count; /* used to tell whether we're decoding a future version of FLAC or just got a bad sync */ unsigned unparseable_frame_count; /* used to tell whether we're decoding a future version of FLAC or just got a bad sync */
#if FLAC__HAS_OGG
FLAC__bool got_a_frame; /* hack needed in Ogg FLAC seek routine to check when process_single() actually writes a frame */ FLAC__bool got_a_frame; /* hack needed in Ogg FLAC seek routine to check when process_single() actually writes a frame */
#endif
} FLAC__StreamDecoderPrivate; } FLAC__StreamDecoderPrivate;
/*********************************************************************** /***********************************************************************
@@ -362,10 +352,8 @@ static FLAC__StreamDecoderInitStatus init_stream_internal_(
if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED) if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED)
return FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED; return FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED;
#if !FLAC__HAS_OGG if(!FLAC__HAS_OGG == 0 && is_ogg)
if(is_ogg)
return FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER; return FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER;
#endif
if( if(
0 == read_callback || 0 == read_callback ||
@@ -914,10 +902,9 @@ FLAC_API FLAC__bool FLAC__stream_decoder_get_decode_position(const FLAC__StreamD
FLAC__ASSERT(0 != decoder->private_); FLAC__ASSERT(0 != decoder->private_);
FLAC__ASSERT(0 != position); FLAC__ASSERT(0 != position);
#if FLAC__HAS_OGG if(FLAC__HAS_OGG && decoder->private_->is_ogg)
if(decoder->private_->is_ogg)
return false; return false;
#endif
if(0 == decoder->private_->tell_callback) if(0 == decoder->private_->tell_callback)
return false; return false;
if(decoder->private_->tell_callback(decoder, position, decoder->private_->client_data) != FLAC__STREAM_DECODER_TELL_STATUS_OK) if(decoder->private_->tell_callback(decoder, position, decoder->private_->client_data) != FLAC__STREAM_DECODER_TELL_STATUS_OK)
@@ -1234,9 +1221,7 @@ unsigned FLAC__stream_decoder_get_input_bytes_unconsumed(const FLAC__StreamDecod
void set_defaults_(FLAC__StreamDecoder *decoder) void set_defaults_(FLAC__StreamDecoder *decoder)
{ {
#if FLAC__HAS_OGG
decoder->private_->is_ogg = false; decoder->private_->is_ogg = false;
#endif
decoder->private_->read_callback = 0; decoder->private_->read_callback = 0;
decoder->private_->seek_callback = 0; decoder->private_->seek_callback = 0;
decoder->private_->tell_callback = 0; decoder->private_->tell_callback = 0;

8
src/libFLAC/stream_encoder.c
View File

@@ -368,9 +368,7 @@ typedef struct FLAC__StreamEncoderPrivate {
FLAC__bool disable_constant_subframes; FLAC__bool disable_constant_subframes;
FLAC__bool disable_fixed_subframes; FLAC__bool disable_fixed_subframes;
FLAC__bool disable_verbatim_subframes; FLAC__bool disable_verbatim_subframes;
#if FLAC__HAS_OGG
FLAC__bool is_ogg; FLAC__bool is_ogg;
#endif
FLAC__StreamEncoderReadCallback read_callback; /* currently only needed for Ogg FLAC */ FLAC__StreamEncoderReadCallback read_callback; /* currently only needed for Ogg FLAC */
FLAC__StreamEncoderSeekCallback seek_callback; FLAC__StreamEncoderSeekCallback seek_callback;
FLAC__StreamEncoderTellCallback tell_callback; FLAC__StreamEncoderTellCallback tell_callback;
@@ -635,10 +633,8 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_(
if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED) if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
return FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED; return FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED;
#if !FLAC__HAS_OGG if(FLAC__HAS_OGG == 0 && is_ogg)
if(is_ogg)
return FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER; return FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER;
#endif
if(0 == write_callback || (seek_callback && 0 == tell_callback)) if(0 == write_callback || (seek_callback && 0 == tell_callback))
return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS; return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS;
@@ -2328,9 +2324,7 @@ void set_defaults_(FLAC__StreamEncoder *encoder)
encoder->private_->disable_constant_subframes = false; encoder->private_->disable_constant_subframes = false;
encoder->private_->disable_fixed_subframes = false; encoder->private_->disable_fixed_subframes = false;
encoder->private_->disable_verbatim_subframes = false; encoder->private_->disable_verbatim_subframes = false;
#if FLAC__HAS_OGG
encoder->private_->is_ogg = false; encoder->private_->is_ogg = false;
#endif
encoder->private_->read_callback = 0; encoder->private_->read_callback = 0;
encoder->private_->write_callback = 0; encoder->private_->write_callback = 0;
encoder->private_->seek_callback = 0; encoder->private_->seek_callback = 0;