diff options
author | oreo639 <oreo6391@gmail.com> | 2019-09-02 10:48:47 -0700 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-09-15 11:35:36 +1000 |
commit | 01167efa6a7cb6aa6aa8865594cd58c6db06471b (patch) | |
tree | 529d27ec1a263733292b21b3ade1bb27c3d3173e /include/share/grabbag/replaygain.h | |
parent | 9ea40e34f89ca120b6a3af359c7a78646049cfa4 (diff) | |
download | flac-01167efa6a7cb6aa6aa8865594cd58c6db06471b.tar.gz |
Fix function redefinition on arm-none-eabi compilers
Diffstat (limited to 'include/share/grabbag/replaygain.h')
-rw-r--r-- | include/share/grabbag/replaygain.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/share/grabbag/replaygain.h b/include/share/grabbag/replaygain.h index faa32720..fdf63acc 100644 --- a/include/share/grabbag/replaygain.h +++ b/include/share/grabbag/replaygain.h @@ -34,7 +34,7 @@ extern "C" { #endif -extern const unsigned GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; +extern const uint32_t GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; extern const FLAC__byte * const GRABBAG__REPLAYGAIN_TAG_REFERENCE_LOUDNESS; /* = "REPLAYGAIN_REFERENCE_LOUDNESS" */ extern const FLAC__byte * const GRABBAG__REPLAYGAIN_TAG_TITLE_GAIN; /* = "REPLAYGAIN_TRACK_GAIN" */ @@ -42,12 +42,12 @@ extern const FLAC__byte * const GRABBAG__REPLAYGAIN_TAG_TITLE_PEAK; /* = "REPLAY extern const FLAC__byte * const GRABBAG__REPLAYGAIN_TAG_ALBUM_GAIN; /* = "REPLAYGAIN_ALBUM_GAIN" */ extern const FLAC__byte * const GRABBAG__REPLAYGAIN_TAG_ALBUM_PEAK; /* = "REPLAYGAIN_ALBUM_PEAK" */ -FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency); +FLAC__bool grabbag__replaygain_is_valid_sample_frequency(uint32_t sample_frequency); -FLAC__bool grabbag__replaygain_init(unsigned sample_frequency); +FLAC__bool grabbag__replaygain_init(uint32_t sample_frequency); /* 'bps' must be valid for FLAC, i.e. >=4 and <= 32 */ -FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples); +FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, uint32_t bps, uint32_t samples); void grabbag__replaygain_get_album(float *gain, float *peak); void grabbag__replaygain_get_title(float *gain, float *peak); |