--- a/patches/flac-01-forte.diff Tue Apr 29 03:07:04 2008 +0000
+++ b/patches/flac-01-forte.diff Tue Apr 29 14:58:40 2008 +0000
@@ -27,65 +27,65 @@
--- flac-1.2.0/include/share/replaygain_analysis.h-orig 2007-08-01 13:37:48.953601000 -0500
+++ flac-1.2.0/include/share/replaygain_analysis.h 2007-08-01 13:13:34.288739000 -0500
@@ -1,59 +1,59 @@
--/*
-- * ReplayGainAnalysis - analyzes input samples and give the recommended dB change
-- * Copyright (C) 2001 David Robinson and Glen Sawyer
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- * concept and filter values by David Robinson ([email protected])
-- * -- blame him if you think the idea is flawed
-- * coding by Glen Sawyer ([email protected]) 442 N 700 E, Provo, UT 84606 USA
-- * -- blame him if you think this runs too slowly, or the coding is otherwise flawed
-- * minor cosmetic tweaks to integrate with FLAC by Josh Coalson
-- *
-- * For an explanation of the concepts and the basic algorithms involved, go to:
-- * http://www.replaygain.org/
-- */
--
--#ifndef GAIN_ANALYSIS_H
--#define GAIN_ANALYSIS_H
--
--#include <stddef.h>
--
--#define GAIN_NOT_ENOUGH_SAMPLES -24601
--#define GAIN_ANALYSIS_ERROR 0
--#define GAIN_ANALYSIS_OK 1
--
--#define INIT_GAIN_ANALYSIS_ERROR 0
--#define INIT_GAIN_ANALYSIS_OK 1
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--typedef float Float_t; /* Type used for filtering */
--
--extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
--
--int InitGainAnalysis ( long samplefreq );
--int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
--int ResetSampleFrequency ( long samplefreq );
--Float_t GetTitleGain ( void );
--Float_t GetAlbumGain ( void );
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* GAIN_ANALYSIS_H */
+-/*
+- * ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+- * Copyright (C) 2001 David Robinson and Glen Sawyer
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- *
+- * concept and filter values by David Robinson ([email protected])
+- * -- blame him if you think the idea is flawed
+- * coding by Glen Sawyer ([email protected]) 442 N 700 E, Provo, UT 84606 USA
+- * -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+- * minor cosmetic tweaks to integrate with FLAC by Josh Coalson
+- *
+- * For an explanation of the concepts and the basic algorithms involved, go to:
+- * http://www.replaygain.org/
+- */
+-
+-#ifndef GAIN_ANALYSIS_H
+-#define GAIN_ANALYSIS_H
+-
+-#include <stddef.h>
+-
+-#define GAIN_NOT_ENOUGH_SAMPLES -24601
+-#define GAIN_ANALYSIS_ERROR 0
+-#define GAIN_ANALYSIS_OK 1
+-
+-#define INIT_GAIN_ANALYSIS_ERROR 0
+-#define INIT_GAIN_ANALYSIS_OK 1
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-typedef float Float_t; /* Type used for filtering */
+-
+-extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
+-
+-int InitGainAnalysis ( long samplefreq );
+-int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
+-int ResetSampleFrequency ( long samplefreq );
+-Float_t GetTitleGain ( void );
+-Float_t GetAlbumGain ( void );
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* GAIN_ANALYSIS_H */
+/*
+ * ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ * Copyright (C) 2001 David Robinson and Glen Sawyer
@@ -148,32 +148,32 @@
--- flac-1.2.0/src/plugin_winamp2/infobox.c-orig 2007-08-01 13:34:46.716826000 -0500
+++ flac-1.2.0/src/plugin_winamp2/infobox.c 2007-08-01 13:13:34.257582000 -0500
@@ -48,7 +48,7 @@ static const char infoTitle[] = "FLAC Fi
-
- /* TODO: write genres in utf-8 ? */
-
--static __inline int GetGenresFileName(char *buffer, int size)
-+static FLAC_INLINE int GetGenresFileName(char *buffer, int size)
- {
- char *c;
-
+
+ /* TODO: write genres in utf-8 ? */
+
+-static __inline int GetGenresFileName(char *buffer, int size)
++static FLAC_INLINE int GetGenresFileName(char *buffer, int size)
+ {
+ char *c;
+
@@ -273,7 +273,7 @@ static BOOL InitInfoboxInfo(HWND hwnd, c
- return TRUE;
- }
-
--static void __inline SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
-+static void FLAC_INLINE SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
- {
- strcpy(buffer, infoTitle);
-
+ return TRUE;
+ }
+
+-static void __inline SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
++static void FLAC_INLINE SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
+ {
+ strcpy(buffer, infoTitle);
+
@@ -399,7 +399,7 @@ ULONGLONG FileSize(const char *fileName)
- return res.QuadPart;
- }
-
--static __inline char *GetFileName(const char *fullname)
-+static FLAC_INLINE char *GetFileName(const char *fullname)
- {
- const char *c = fullname + strlen(fullname) - 1;
-
+ return res.QuadPart;
+ }
+
+-static __inline char *GetFileName(const char *fullname)
++static FLAC_INLINE char *GetFileName(const char *fullname)
+ {
+ const char *c = fullname + strlen(fullname) - 1;
+
--- flac-1.2.0/src/share/replaygain_analysis/replaygain_analysis.c-orig 2007-08-01 13:36:01.582583000 -0500
+++ flac-1.2.0/src/share/replaygain_analysis/replaygain_analysis.c 2007-08-01 13:22:19.440619000 -0500
@@ -110,10 +110,10 @@ typedef signed int Int32_t;
@@ -248,7 +248,7 @@
-
-
-static FLaC__INLINE size_t local__wide_strlen(const FLAC__uint16 *s)
-+static FLaC_INLINE size_t local__wide_strlen(const FLAC__uint16 *s)
++static FLAC_INLINE size_t local__wide_strlen(const FLAC__uint16 *s)
{
size_t n = 0;
while(*s++)
@@ -257,7 +257,7 @@
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
*/
-static FLaC__INLINE size_t local__utf8len(const FLAC__byte *utf8)
-+static FLaC_INLINE size_t local__utf8len(const FLAC__byte *utf8)
++static FLAC_INLINE size_t local__utf8len(const FLAC__byte *utf8)
{
FLAC__ASSERT(0 != utf8);
if ((utf8[0] & 0x80) == 0) {
@@ -266,7 +266,7 @@
-static FLaC__INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
-+static FLaC_INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
++static FLAC_INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
{
const size_t len = local__utf8len(utf8);
@@ -275,7 +275,7 @@
}
-static FLaC__INLINE size_t local__ucs2len(FLAC__uint16 ucs2)
-+static FLaC_INLINE size_t local__ucs2len(FLAC__uint16 ucs2)
++static FLAC_INLINE size_t local__ucs2len(FLAC__uint16 ucs2)
{
if (ucs2 < 0x0080)
return 1;
@@ -284,7 +284,7 @@
}
-static FLaC__INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
-+static FLaC_INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
++static FLAC_INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
{
if (ucs2 < 0x080) {
utf8[0] = (FLAC__byte)ucs2;