diff --git a/SilentPatch/FLAC/callback.h b/SilentPatch/FLAC/callback.h index 71bbaec..f942dd2 100644 --- a/SilentPatch/FLAC/callback.h +++ b/SilentPatch/FLAC/callback.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 diff --git a/SilentPatch/FLAC/export.h b/SilentPatch/FLAC/export.h index 2232b41..d52f0bb 100644 --- a/SilentPatch/FLAC/export.h +++ b/SilentPatch/FLAC/export.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 @@ -61,9 +61,9 @@ #elif defined(_MSC_VER) #ifdef FLAC_API_EXPORTS -#define FLAC_API _declspec(dllexport) +#define FLAC_API __declspec(dllexport) #else -#define FLAC_API _declspec(dllimport) +#define FLAC_API __declspec(dllimport) #endif #elif defined(FLAC__USE_VISIBILITY_ATTR) diff --git a/SilentPatch/FLAC/format.h b/SilentPatch/FLAC/format.h index e02388c..c087d4a 100644 --- a/SilentPatch/FLAC/format.h +++ b/SilentPatch/FLAC/format.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 @@ -512,8 +512,8 @@ typedef enum { FLAC__METADATA_TYPE_UNDEFINED = 7, /**< marker to denote beginning of undefined type range; this number will increase as new metadata types are added */ - FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE, - /**< No type will ever be greater than this. There is not enough room in the protocol block. */ + FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE, + /**< No type will ever be greater than this. There is not enough room in the protocol block. */ } FLAC__MetadataType; /** Maps a FLAC__MetadataType to a C string. diff --git a/SilentPatch/FLAC/metadata.h b/SilentPatch/FLAC/metadata.h index fcc8ed9..4e18cd6 100644 --- a/SilentPatch/FLAC/metadata.h +++ b/SilentPatch/FLAC/metadata.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 @@ -500,7 +500,7 @@ FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const * \retval unsigned * The length of the metadata block at the current iterator position. * The is same length as that in the - * metadata block header, + * metadata block header, * i.e. the length of the metadata body that follows the header. */ FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator); @@ -667,7 +667,7 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_delete_block(FLAC__Metadata_S * * - Create a new chain using FLAC__metadata_chain_new(). A chain is a * linked list of FLAC metadata blocks. - * - Read all metadata into the the chain from a FLAC file using + * - Read all metadata into the chain from a FLAC file using * FLAC__metadata_chain_read() or FLAC__metadata_chain_read_ogg() and * check the status. * - Optionally, consolidate the padding using @@ -764,7 +764,7 @@ typedef enum { FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH, /**< FLAC__metadata_chain_write() was called on a chain read by * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), - * or + * or * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile() * was called on a chain read by * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). @@ -1692,7 +1692,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__Str * For convenience, a trailing NUL is added to the entry if it doesn't have * one already. * - * Depending on the the value of \a all, either all or just the first comment + * Depending on the value of \a all, either all or just the first comment * whose field name(s) match the given entry's name will be replaced by the * given entry. If no comments match, \a entry will simply be appended. * diff --git a/SilentPatch/FLAC/ordinals.h b/SilentPatch/FLAC/ordinals.h index a057299..ea52ea6 100644 --- a/SilentPatch/FLAC/ordinals.h +++ b/SilentPatch/FLAC/ordinals.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 diff --git a/SilentPatch/FLAC/stream_decoder.h b/SilentPatch/FLAC/stream_decoder.h index 152643f..39c958d 100644 --- a/SilentPatch/FLAC/stream_decoder.h +++ b/SilentPatch/FLAC/stream_decoder.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * 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 @@ -228,7 +228,7 @@ typedef enum { */ FLAC__STREAM_DECODER_ABORTED, - /**< The decoder was aborted by the read callback. */ + /**< The decoder was aborted by the read or write callback. */ FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR, /**< An error occurred allocating memory. The decoder is in an invalid diff --git a/SilentPatchSA/SilentPatchSA.vcxproj b/SilentPatchSA/SilentPatchSA.vcxproj index 8516c0e..cb2d8ac 100644 --- a/SilentPatchSA/SilentPatchSA.vcxproj +++ b/SilentPatchSA/SilentPatchSA.vcxproj @@ -65,7 +65,7 @@ true Windows - winmm.lib;Shlwapi.lib;libFLAC_static_d.lib;win_utf8_io_static_d.lib;%(AdditionalDependencies) + Shlwapi.lib;libFLAC_static_d.lib;%(AdditionalDependencies) copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\SilentPatchSA.asi" @@ -100,7 +100,7 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio true true Windows - winmm.lib;Shlwapi.lib;libFLAC_static.lib;win_utf8_io_static.lib;%(AdditionalDependencies) + Shlwapi.lib;libFLAC_static.lib;%(AdditionalDependencies) copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\SilentPatchSA.asi" diff --git a/SilentPatchSA/libFLAC_static.lib b/SilentPatchSA/libFLAC_static.lib index bb0bb4f..3a49974 100644 Binary files a/SilentPatchSA/libFLAC_static.lib and b/SilentPatchSA/libFLAC_static.lib differ diff --git a/SilentPatchSA/libFLAC_static_d.lib b/SilentPatchSA/libFLAC_static_d.lib index f187b8e..e146c17 100644 Binary files a/SilentPatchSA/libFLAC_static_d.lib and b/SilentPatchSA/libFLAC_static_d.lib differ diff --git a/SilentPatchSA/win_utf8_io_static.lib b/SilentPatchSA/win_utf8_io_static.lib deleted file mode 100644 index c11ed48..0000000 Binary files a/SilentPatchSA/win_utf8_io_static.lib and /dev/null differ diff --git a/SilentPatchSA/win_utf8_io_static_d.lib b/SilentPatchSA/win_utf8_io_static_d.lib deleted file mode 100644 index 07383f7..0000000 Binary files a/SilentPatchSA/win_utf8_io_static_d.lib and /dev/null differ