diff --git a/src/libflac/private/FLAC b/src/libflac/private/FLAC deleted file mode 120000 index 90e9c10..0000000 --- a/src/libflac/private/FLAC +++ /dev/null @@ -1 +0,0 @@ -../FLAC \ No newline at end of file diff --git a/src/libflac/private/bitmath.h b/src/libflac/private/bitmath.h index 1cd4dda..96c4f3f 100644 --- a/src/libflac/private/bitmath.h +++ b/src/libflac/private/bitmath.h @@ -35,10 +35,10 @@ #include -#include "FLAC/ordinals.h" -#include "FLAC/assert.h" +#include "../FLAC/ordinals.h" +#include "../FLAC/assert.h" -#include "share/compat.h" +#include "../share/compat.h" #if defined(_MSC_VER) #include /* for _BitScanReverse* */ diff --git a/src/libflac/private/bitreader.h b/src/libflac/private/bitreader.h index 7c73165..91230ee 100644 --- a/src/libflac/private/bitreader.h +++ b/src/libflac/private/bitreader.h @@ -34,7 +34,7 @@ #define FLAC__PRIVATE__BITREADER_H #include /* for FILE */ -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" #include "cpu.h" /* diff --git a/src/libflac/private/bitwriter.h b/src/libflac/private/bitwriter.h index ef3ad1b..8284ff8 100644 --- a/src/libflac/private/bitwriter.h +++ b/src/libflac/private/bitwriter.h @@ -34,7 +34,7 @@ #define FLAC__PRIVATE__BITWRITER_H #include /* for FILE */ -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" /* * opaque structure definition diff --git a/src/libflac/private/cpu.h b/src/libflac/private/cpu.h index 7c65180..c5384d4 100644 --- a/src/libflac/private/cpu.h +++ b/src/libflac/private/cpu.h @@ -33,11 +33,11 @@ #ifndef FLAC__PRIVATE__CPU_H #define FLAC__PRIVATE__CPU_H -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif #ifndef FLAC__CPU_X86_64 diff --git a/src/libflac/private/crc.h b/src/libflac/private/crc.h index 76e9420..684137c 100644 --- a/src/libflac/private/crc.h +++ b/src/libflac/private/crc.h @@ -35,7 +35,7 @@ #include -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" /* 8 bit CRC generator, MSB shifted first ** polynomial = x^8 + x^2 + x^1 + x^0 diff --git a/src/libflac/private/fixed.h b/src/libflac/private/fixed.h index b6c9e6d..92d694b 100644 --- a/src/libflac/private/fixed.h +++ b/src/libflac/private/fixed.h @@ -33,13 +33,13 @@ #ifndef FLAC__PRIVATE__FIXED_H #define FLAC__PRIVATE__FIXED_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif #include "cpu.h" #include "float.h" -#include "FLAC/format.h" +#include "../FLAC/format.h" /* * FLAC__fixed_compute_best_predictor() diff --git a/src/libflac/private/float.h b/src/libflac/private/float.h index 12ece60..2ead792 100644 --- a/src/libflac/private/float.h +++ b/src/libflac/private/float.h @@ -33,11 +33,11 @@ #ifndef FLAC__PRIVATE__FLOAT_H #define FLAC__PRIVATE__FLOAT_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" /* * All the code in libFLAC that uses float and double diff --git a/src/libflac/private/format.h b/src/libflac/private/format.h index 5b9cfbd..e27f251 100644 --- a/src/libflac/private/format.h +++ b/src/libflac/private/format.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__FORMAT_H #define FLAC__PRIVATE__FORMAT_H -#include "FLAC/format.h" +#include "../FLAC/format.h" unsigned FLAC__format_get_max_rice_partition_order(unsigned blocksize, unsigned predictor_order); unsigned FLAC__format_get_max_rice_partition_order_from_blocksize(unsigned blocksize); diff --git a/src/libflac/private/lpc.h b/src/libflac/private/lpc.h index 479624a..aeb8e62 100644 --- a/src/libflac/private/lpc.h +++ b/src/libflac/private/lpc.h @@ -33,13 +33,13 @@ #ifndef FLAC__PRIVATE__LPC_H #define FLAC__PRIVATE__LPC_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif #include "cpu.h" #include "float.h" -#include "FLAC/format.h" +#include "../FLAC/format.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY diff --git a/src/libflac/private/md5.h b/src/libflac/private/md5.h index c665ab3..3d4967c 100644 --- a/src/libflac/private/md5.h +++ b/src/libflac/private/md5.h @@ -26,7 +26,7 @@ * Still in the public domain, with no warranty. */ -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" typedef union { FLAC__byte *p8; diff --git a/src/libflac/private/memory.h b/src/libflac/private/memory.h index 271a692..6a54ab2 100644 --- a/src/libflac/private/memory.h +++ b/src/libflac/private/memory.h @@ -33,14 +33,14 @@ #ifndef FLAC__PRIVATE__MEMORY_H #define FLAC__PRIVATE__MEMORY_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif #include /* for size_t */ #include "float.h" -#include "FLAC/ordinals.h" /* for FLAC__bool */ +#include "../FLAC/ordinals.h" /* for FLAC__bool */ /* Returns the unaligned address returned by malloc. * Use free() on this address to deallocate. diff --git a/src/libflac/private/metadata.h b/src/libflac/private/metadata.h index 161947f..7cb5e62 100644 --- a/src/libflac/private/metadata.h +++ b/src/libflac/private/metadata.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__METADATA_H #define FLAC__PRIVATE__METADATA_H -#include "FLAC/metadata.h" +#include "../FLAC/metadata.h" /* WATCHOUT: all malloc()ed data in the block is free()ed; this may not * be a consistent state (e.g. PICTURE) or equivalent to the initial diff --git a/src/libflac/private/ogg_decoder_aspect.h b/src/libflac/private/ogg_decoder_aspect.h deleted file mode 100644 index 218f44e..0000000 --- a/src/libflac/private/ogg_decoder_aspect.h +++ /dev/null @@ -1,80 +0,0 @@ -/* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2016 Xiph.Org Foundation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of the Xiph.org Foundation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FLAC__PRIVATE__OGG_DECODER_ASPECT_H -#define FLAC__PRIVATE__OGG_DECODER_ASPECT_H - -#include - -#include "FLAC/ordinals.h" -#include "FLAC/stream_decoder.h" /* for FLAC__StreamDecoderReadStatus */ - -typedef struct FLAC__OggDecoderAspect { - /* these are storage for values that can be set through the API */ - FLAC__bool use_first_serial_number; - long serial_number; - - /* these are for internal state related to Ogg decoding */ - ogg_stream_state stream_state; - ogg_sync_state sync_state; - unsigned version_major, version_minor; - FLAC__bool need_serial_number; - FLAC__bool end_of_stream; - FLAC__bool have_working_page; /* only if true will the following vars be valid */ - ogg_page working_page; - FLAC__bool have_working_packet; /* only if true will the following vars be valid */ - ogg_packet working_packet; /* as we work through the packet we will move working_packet.packet forward and working_packet.bytes down */ -} FLAC__OggDecoderAspect; - -void FLAC__ogg_decoder_aspect_set_serial_number(FLAC__OggDecoderAspect *aspect, long value); -void FLAC__ogg_decoder_aspect_set_defaults(FLAC__OggDecoderAspect *aspect); -FLAC__bool FLAC__ogg_decoder_aspect_init(FLAC__OggDecoderAspect *aspect); -void FLAC__ogg_decoder_aspect_finish(FLAC__OggDecoderAspect *aspect); -void FLAC__ogg_decoder_aspect_flush(FLAC__OggDecoderAspect *aspect); -void FLAC__ogg_decoder_aspect_reset(FLAC__OggDecoderAspect *aspect); - -typedef enum { - FLAC__OGG_DECODER_ASPECT_READ_STATUS_OK = 0, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_END_OF_STREAM, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_LOST_SYNC, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_NOT_FLAC, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_UNSUPPORTED_MAPPING_VERSION, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_ABORT, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_ERROR, - FLAC__OGG_DECODER_ASPECT_READ_STATUS_MEMORY_ALLOCATION_ERROR -} FLAC__OggDecoderAspectReadStatus; - -typedef FLAC__OggDecoderAspectReadStatus (*FLAC__OggDecoderAspectReadCallbackProxy)(const void *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); - -FLAC__OggDecoderAspectReadStatus FLAC__ogg_decoder_aspect_read_callback_wrapper(FLAC__OggDecoderAspect *aspect, FLAC__byte buffer[], size_t *bytes, FLAC__OggDecoderAspectReadCallbackProxy read_callback, const FLAC__StreamDecoder *decoder, void *client_data); - -#endif diff --git a/src/libflac/private/ogg_encoder_aspect.h b/src/libflac/private/ogg_encoder_aspect.h deleted file mode 100644 index f55ef32..0000000 --- a/src/libflac/private/ogg_encoder_aspect.h +++ /dev/null @@ -1,63 +0,0 @@ -/* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2016 Xiph.Org Foundation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of the Xiph.org Foundation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FLAC__PRIVATE__OGG_ENCODER_ASPECT_H -#define FLAC__PRIVATE__OGG_ENCODER_ASPECT_H - -#include - -#include "FLAC/ordinals.h" -#include "FLAC/stream_encoder.h" /* for FLAC__StreamEncoderWriteStatus */ - -typedef struct FLAC__OggEncoderAspect { - /* these are storage for values that can be set through the API */ - long serial_number; - unsigned num_metadata; - - /* these are for internal state related to Ogg encoding */ - ogg_stream_state stream_state; - ogg_page page; - FLAC__bool seen_magic; /* true if we've seen the fLaC magic in the write callback yet */ - FLAC__bool is_first_packet; - FLAC__uint64 samples_written; -} FLAC__OggEncoderAspect; - -void FLAC__ogg_encoder_aspect_set_serial_number(FLAC__OggEncoderAspect *aspect, long value); -FLAC__bool FLAC__ogg_encoder_aspect_set_num_metadata(FLAC__OggEncoderAspect *aspect, unsigned value); -void FLAC__ogg_encoder_aspect_set_defaults(FLAC__OggEncoderAspect *aspect); -FLAC__bool FLAC__ogg_encoder_aspect_init(FLAC__OggEncoderAspect *aspect); -void FLAC__ogg_encoder_aspect_finish(FLAC__OggEncoderAspect *aspect); - -typedef FLAC__StreamEncoderWriteStatus (*FLAC__OggEncoderAspectWriteCallbackProxy)(const void *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data); - -FLAC__StreamEncoderWriteStatus FLAC__ogg_encoder_aspect_write_callback_wrapper(FLAC__OggEncoderAspect *aspect, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, FLAC__bool is_last_block, FLAC__OggEncoderAspectWriteCallbackProxy write_callback, void *encoder, void *client_data); -#endif diff --git a/src/libflac/private/ogg_helper.h b/src/libflac/private/ogg_helper.h deleted file mode 100644 index 4c1000c..0000000 --- a/src/libflac/private/ogg_helper.h +++ /dev/null @@ -1,44 +0,0 @@ -/* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2016 Xiph.Org Foundation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of the Xiph.org Foundation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FLAC__PRIVATE__OGG_HELPER_H -#define FLAC__PRIVATE__OGG_HELPER_H - -#include -#include "FLAC/stream_encoder.h" /* for FLAC__StreamEncoder */ - -void simple_ogg_page__init(ogg_page *page); -void simple_ogg_page__clear(ogg_page *page); -FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderReadCallback read_callback, void *client_data); -FLAC__bool simple_ogg_page__set_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderWriteCallback write_callback, void *client_data); - -#endif diff --git a/src/libflac/private/ogg_mapping.h b/src/libflac/private/ogg_mapping.h deleted file mode 100644 index 1fa022d..0000000 --- a/src/libflac/private/ogg_mapping.h +++ /dev/null @@ -1,64 +0,0 @@ -/* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2016 Xiph.Org Foundation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of the Xiph.org Foundation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FLAC__PRIVATE__OGG_MAPPING_H -#define FLAC__PRIVATE__OGG_MAPPING_H - -#include "FLAC/ordinals.h" - -/** The length of the packet type field in bytes. */ -#define FLAC__OGG_MAPPING_PACKET_TYPE_LENGTH (1u) - -extern const unsigned FLAC__OGG_MAPPING_PACKET_TYPE_LEN; /* = 8 bits */ - -extern const FLAC__byte FLAC__OGG_MAPPING_FIRST_HEADER_PACKET_TYPE; /* = 0x7f */ - -/** The length of the 'FLAC' magic in bytes. */ -#define FLAC__OGG_MAPPING_MAGIC_LENGTH (4u) - -extern const FLAC__byte * const FLAC__OGG_MAPPING_MAGIC; /* = "FLAC" */ - -extern const unsigned FLAC__OGG_MAPPING_VERSION_MAJOR_LEN; /* = 8 bits */ -extern const unsigned FLAC__OGG_MAPPING_VERSION_MINOR_LEN; /* = 8 bits */ - -/** The length of the Ogg FLAC mapping major version number in bytes. */ -#define FLAC__OGG_MAPPING_VERSION_MAJOR_LENGTH (1u) - -/** The length of the Ogg FLAC mapping minor version number in bytes. */ -#define FLAC__OGG_MAPPING_VERSION_MINOR_LENGTH (1u) - -extern const unsigned FLAC__OGG_MAPPING_NUM_HEADERS_LEN; /* = 16 bits */ - -/** The length of the #-of-header-packets number bytes. */ -#define FLAC__OGG_MAPPING_NUM_HEADERS_LENGTH (2u) - -#endif diff --git a/src/libflac/private/share b/src/libflac/private/share deleted file mode 120000 index f2d0b20..0000000 --- a/src/libflac/private/share +++ /dev/null @@ -1 +0,0 @@ -../share \ No newline at end of file diff --git a/src/libflac/private/stream_encoder.h b/src/libflac/private/stream_encoder.h index ab1721f..5ad2ed5 100644 --- a/src/libflac/private/stream_encoder.h +++ b/src/libflac/private/stream_encoder.h @@ -33,9 +33,9 @@ #ifndef FLAC__PRIVATE__STREAM_ENCODER_H #define FLAC__PRIVATE__STREAM_ENCODER_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif /* * This is used to avoid overflow with unusual signals in 32-bit @@ -45,7 +45,7 @@ #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/cpu.h" -#include "FLAC/format.h" +#include "../FLAC/format.h" #ifdef FLAC__SSE2_SUPPORTED extern void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], diff --git a/src/libflac/private/stream_encoder_framing.h b/src/libflac/private/stream_encoder_framing.h index f633a9d..9c41ca4 100644 --- a/src/libflac/private/stream_encoder_framing.h +++ b/src/libflac/private/stream_encoder_framing.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__STREAM_ENCODER_FRAMING_H #define FLAC__PRIVATE__STREAM_ENCODER_FRAMING_H -#include "FLAC/format.h" +#include "../FLAC/format.h" #include "bitwriter.h" FLAC__bool FLAC__add_metadata_block(const FLAC__StreamMetadata *metadata, FLAC__BitWriter *bw); diff --git a/src/libflac/private/window.h b/src/libflac/private/window.h index 0562158..0cee628 100644 --- a/src/libflac/private/window.h +++ b/src/libflac/private/window.h @@ -33,12 +33,12 @@ #ifndef FLAC__PRIVATE__WINDOW_H #define FLAC__PRIVATE__WINDOW_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H #include -#endif +//#endif #include "float.h" -#include "FLAC/format.h" +#include "../FLAC/format.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY diff --git a/src/libflac/protected/FLAC b/src/libflac/protected/FLAC deleted file mode 120000 index 90e9c10..0000000 --- a/src/libflac/protected/FLAC +++ /dev/null @@ -1 +0,0 @@ -../FLAC \ No newline at end of file diff --git a/src/libflac/protected/stream_decoder.h b/src/libflac/protected/stream_decoder.h index 5c31c16..a397127 100644 --- a/src/libflac/protected/stream_decoder.h +++ b/src/libflac/protected/stream_decoder.h @@ -33,7 +33,7 @@ #ifndef FLAC__PROTECTED__STREAM_DECODER_H #define FLAC__PROTECTED__STREAM_DECODER_H -#include "FLAC/stream_decoder.h" +#include "../FLAC/stream_decoder.h" #if FLAC__HAS_OGG #include "private/ogg_decoder_aspect.h" #endif diff --git a/src/libflac/protected/stream_encoder.h b/src/libflac/protected/stream_encoder.h index 8850c6b..5823098 100644 --- a/src/libflac/protected/stream_encoder.h +++ b/src/libflac/protected/stream_encoder.h @@ -33,7 +33,7 @@ #ifndef FLAC__PROTECTED__STREAM_ENCODER_H #define FLAC__PROTECTED__STREAM_ENCODER_H -#include "FLAC/stream_encoder.h" +#include "../FLAC/stream_encoder.h" #if FLAC__HAS_OGG #include "private/ogg_encoder_aspect.h" #endif diff --git a/src/libflac/share/alloc.h b/src/libflac/share/alloc.h index 58ef1f1..c3dac5f 100644 --- a/src/libflac/share/alloc.h +++ b/src/libflac/share/alloc.h @@ -33,9 +33,9 @@ #ifndef FLAC__SHARE__ALLOC_H #define FLAC__SHARE__ALLOC_H -#ifdef HAVE_CONFIG_H +//#ifdef HAVE_CONFIG_H # include -#endif +//#endif /* WATCHOUT: for c++ you may have to #define __STDC_LIMIT_MACROS 1 real early * before #including this file, otherwise SIZE_MAX might not be defined diff --git a/src/libflac/share/replaygain_synthesis.h b/src/libflac/share/replaygain_synthesis.h index 5f4c3ff..ed88260 100644 --- a/src/libflac/share/replaygain_synthesis.h +++ b/src/libflac/share/replaygain_synthesis.h @@ -21,7 +21,7 @@ #define FLAC__SHARE__REPLAYGAIN_SYNTHESIS_H #include /* for size_t */ -#include "FLAC/format.h" +#include "../FLAC/format.h" #define FLAC_SHARE__MAX_SUPPORTED_CHANNELS FLAC__MAX_CHANNELS diff --git a/src/libflac/share/windows_unicode_filenames.h b/src/libflac/share/windows_unicode_filenames.h index 86820ca..cbfd35a 100644 --- a/src/libflac/share/windows_unicode_filenames.h +++ b/src/libflac/share/windows_unicode_filenames.h @@ -37,7 +37,7 @@ #include #include #include -#include "FLAC/ordinals.h" +#include "../FLAC/ordinals.h" #ifdef __cplusplus extern "C" {