Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 09:03:36 +02:00
Code Issues Releases Wiki Activity

Upgrades libsndfile to 1.0.24.

Browse Source
This commit is contained in:
lllucius
2011-04-03 03:08:57 +00:00
parent dbf2cdf605
commit fa00dd005f
267 changed files with 13363 additions and 14998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
win/Projects/libsndfile/config.h
View File

@@ -1,28 +1,13 @@
/*
** Copyright (C) 2002-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
**
** This program 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 program 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 program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
** This file was autogenerated on Linux and then modified to support
** Windows.
*/
/* src/config.h. Generated from config.h.in by configure. */
/* src/config.h.in. Generated from configure.ac by autoheader. */
/*
** This is the Win32 version of the file config.h which is autogenerated
** on Unix systems.
*/
/* The following was added to provide the necessary support on Windows */
#if defined(LIBSNDFILE_PRIVATE_CONFIG) && !defined(LIBSNDFILE_HAVE_CONFIG)
#define LIBSNDFILE_HAVE_CONFIG 1
#pragma warning (disable : 4244)
#pragma warning (disable : 4761)
@@ -41,7 +26,6 @@ typedef unsigned __int64 uint64_t;
/* Win32 doesn't seem to have these functions.
** Therefore implement inline versions of these functions here.
*/
__inline long int
lrint (double flt)
{ int intgr;
@@ -90,6 +74,11 @@ llrintf (float flt)
return intgr ;
}
/* Nor does it have the snprintf function */
#define snprintf _snprintf
/* The above was added to provide the necessary support on Windows */
/* Set to 1 if the compile is GNU GCC. */
/* #undef COMPILER_IS_GCC */
@@ -168,11 +157,8 @@ llrintf (float flt)
/* Define to 1 if you have the <inttypes.h> header file. */
/* #undef HAVE_INTTYPES_H */
/* Set to 1 if you have JACK. */
/* #undef HAVE_JACK */
/* Define to 1 if you have the `m' library (-lm). */
#define HAVE_LIBM 1
/* #undef HAVE_LIBM */
/* Define to 1 if you have the <locale.h> header file. */
/* #undef HAVE_LOCALE_H */
@@ -204,6 +190,9 @@ llrintf (float flt)
/* Define to 1 if you have the `open' function. */
#define HAVE_OPEN 1
/* Define to 1 if you have the `pipe' function. */
/* #undef HAVE_PIPE */
/* Define to 1 if you have the `pread' function. */
/* #undef HAVE_PREAD */
@@ -219,6 +208,9 @@ llrintf (float flt)
/* Define to 1 if you have the `setlocale' function. */
/* #undef HAVE_SETLOCALE */
/* Define to 1 if you have the <sndio.h> header file. */
/* #undef HAVE_SNDIO_H */
/* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1
@@ -258,6 +250,9 @@ llrintf (float flt)
/* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1
/* Define to 1 if you have the `waitpid' function. */
/* #undef HAVE_WAITPID */
/* Define to 1 if you have the `write' function. */
#define HAVE_WRITE 1
@@ -278,22 +273,25 @@ llrintf (float flt)
#define PACKAGE "libsndfile"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "erikd@mega-nerd.com"
#define PACKAGE_BUGREPORT "sndfile@mega-nerd.com"
/* Define to the full name of this package. */
#define PACKAGE_NAME "libsndfile"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libsndfile 1.0.18"
#define PACKAGE_STRING "libsndfile 1.0.24"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libsndfile"
/* Define to the home page for this package. */
#define PACKAGE_URL "http://www.mega-nerd.com/libsndfile/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.0.18"
#define PACKAGE_VERSION "1.0.24"
/* Set to maximum allowed value of sf_count_t type. */
#define SF_COUNT_MAX LLONG_MAX
#define SF_COUNT_MAX 0x7fffffffffffffffi64
/* The size of `double', as computed by sizeof. */
#define SIZEOF_DOUBLE 8
@@ -337,6 +335,9 @@ llrintf (float flt)
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 4
/* The size of `wchar_t', as computed by sizeof. */
#define SIZEOF_WCHAR_T 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -347,7 +348,7 @@ llrintf (float flt)
#define USE_WINDOWS_API 1
/* Version number of package */
#define VERSION "1.0.18"
#define VERSION "1.0.24"
/* Set to 1 if windows DLL is being built. */
#define WIN32_TARGET_DLL 0
@@ -363,14 +364,7 @@ llrintf (float flt)
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
#undef CPU_IS_BIG_ENDIAN
#undef CPU_IS_LITTLE_ENDIAN
#if defined(__BIG_ENDIAN__)
#define CPU_IS_BIG_ENDIAN 1
#define CPU_IS_LITTLE_ENDIAN 0
#else
#define CPU_IS_BIG_ENDIAN 0
#define CPU_IS_LITTLE_ENDIAN 1
#endif
#endif
/* Set to 1 to use C99 printf/snprintf in MinGW. */
/* #undef __USE_MINGW_ANSI_STDIO */
#endif

20
win/Projects/libsndfile/libsndfile.vcproj
View File

@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;LIBSNDFILE_PRIVATE_CONFIG"
StringPooling="true"
RuntimeLibrary="2"
@@ -105,7 +105,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;LIBSNDFILE_PRIVATE_CONFIG"
StringPooling="true"
BasicRuntimeChecks="3"
@@ -171,7 +171,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;LIBSNDFILE_PRIVATE_CONFIG"
StringPooling="true"
BasicRuntimeChecks="3"
@@ -237,7 +237,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;"
AdditionalIncludeDirectories=".;&quot;..\..\..\lib-src\libsndfile\include&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;LIBSNDFILE_PRIVATE_CONFIG"
StringPooling="true"
RuntimeLibrary="2"
@@ -310,6 +310,10 @@
RelativePath="..\..\..\lib-src\libsndfile\src\caf.c"
>
</File>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\chanmap.c"
>
</File>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\chunk.c"
>
@@ -362,6 +366,10 @@
RelativePath="..\..\..\lib-src\libsndfile\src\htk.c"
>
</File>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\id3.c"
>
</File>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\ima_adpcm.c"
>
@@ -494,6 +502,10 @@
<Filter
Name="Header Files"
>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\chanmap.h"
>
</File>
<File
RelativePath="..\..\..\lib-src\libsndfile\src\common.h"
>

112
win/Projects/libsndfile/sndfile.h
View File

@@ -1,5 +1,5 @@
/*
** Copyright (C) 1999-2008 Erik de Castro Lopo <erikd@mega-nerd.com>
** Copyright (C) 1999-2011Erik de Castro Lopo <erikd@mega-nerd.com>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as published by
@@ -221,7 +221,9 @@ enum
SF_STR_COMMENT = 0x05,
SF_STR_DATE = 0x06,
SF_STR_ALBUM = 0x07,
SF_STR_LICENSE = 0x08
SF_STR_LICENSE = 0x08,
SF_STR_TRACKNUMBER = 0x09,
SF_STR_GENRE = 0x10
} ;
/*
@@ -267,27 +269,34 @@ enum
enum
{ SF_CHANNEL_MAP_INVALID = 0,
SF_CHANNEL_MAP_MONO = 1,
SF_CHANNEL_MAP_LEFT,
SF_CHANNEL_MAP_RIGHT,
SF_CHANNEL_MAP_CENTER,
SF_CHANNEL_MAP_LEFT, /* Apple calls this 'Left' */
SF_CHANNEL_MAP_RIGHT, /* Apple calls this 'Right' */
SF_CHANNEL_MAP_CENTER, /* Apple calls this 'Center' */
SF_CHANNEL_MAP_FRONT_LEFT,
SF_CHANNEL_MAP_FRONT_RIGHT,
SF_CHANNEL_MAP_FRONT_CENTER,
SF_CHANNEL_MAP_REAR_CENTER,
SF_CHANNEL_MAP_REAR_LEFT,
SF_CHANNEL_MAP_REAR_RIGHT,
SF_CHANNEL_MAP_LFE,
SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,
SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,
SF_CHANNEL_MAP_SIDE_LEFT,
SF_CHANNEL_MAP_SIDE_RIGHT,
SF_CHANNEL_MAP_TOP_CENTER,
SF_CHANNEL_MAP_TOP_FRONT_LEFT,
SF_CHANNEL_MAP_TOP_FRONT_RIGHT,
SF_CHANNEL_MAP_TOP_FRONT_CENTER,
SF_CHANNEL_MAP_TOP_REAR_LEFT,
SF_CHANNEL_MAP_TOP_REAR_RIGHT,
SF_CHANNEL_MAP_TOP_REAR_CENTER
SF_CHANNEL_MAP_REAR_CENTER, /* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
SF_CHANNEL_MAP_REAR_LEFT, /* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
SF_CHANNEL_MAP_REAR_RIGHT, /* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
SF_CHANNEL_MAP_LFE, /* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency' */
SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */
SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */
SF_CHANNEL_MAP_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */
SF_CHANNEL_MAP_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */
SF_CHANNEL_MAP_TOP_CENTER, /* Apple calls this 'Top Center Surround' */
SF_CHANNEL_MAP_TOP_FRONT_LEFT, /* Apple calls this 'Vertical Height Left' */
SF_CHANNEL_MAP_TOP_FRONT_RIGHT, /* Apple calls this 'Vertical Height Right' */
SF_CHANNEL_MAP_TOP_FRONT_CENTER, /* Apple calls this 'Vertical Height Center' */
SF_CHANNEL_MAP_TOP_REAR_LEFT, /* Apple and MS call this 'Top Back Left' */
SF_CHANNEL_MAP_TOP_REAR_RIGHT, /* Apple and MS call this 'Top Back Right' */
SF_CHANNEL_MAP_TOP_REAR_CENTER, /* Apple and MS call this 'Top Back Center' */
SF_CHANNEL_MAP_AMBISONIC_B_W,
SF_CHANNEL_MAP_AMBISONIC_B_X,
SF_CHANNEL_MAP_AMBISONIC_B_Y,
SF_CHANNEL_MAP_AMBISONIC_B_Z,
SF_CHANNEL_MAP_MAX
} ;
@@ -296,30 +305,24 @@ enum
typedef struct SNDFILE_tag SNDFILE ;
/* The following typedef is system specific and is defined when libsndfile is
** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t
** (Solaris), __int64_t (Win32) etc. On windows, we need to allow the same
** header file to be compiler by both GCC and the microsoft compiler.
** compiled. sf_count_t will be a 64 bit value when the underlying OS allows
** 64 bit file offsets.
** On windows, we need to allow the same header file to be compiler by both GCC
** and the Microsoft compiler.
*/
#ifdef _MSC_VER
#include <limits.h>
typedef __int64 sf_count_t ;
#define SF_COUNT_MAX LLONG_MAX
#else
#ifdef _MSCVER
typedef __int64_t sf_count_t ;
#if (defined (_MSCVER) || defined (_MSC_VER))
typedef __int64 sf_count_t ;
#define SF_COUNT_MAX 0x7fffffffffffffffi64
#else
typedef off_t sf_count_t ;
typedef int64_t sf_count_t ;
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
#endif
#endif
/* A pointer to a SF_INFO structure is passed to sf_open_read () and filled in.
/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
** On write, the SF_INFO structure is filled in by the user and passed into
** sf_open_write ().
** sf_open ().
*/
struct SF_INFO
@@ -472,6 +475,7 @@ struct SF_VIRTUAL_IO
typedef struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
/* Open the specified file for read, write or both. On error, this will
** return a NULL pointer. To find the error number, pass a NULL SNDFILE
** to sf_strerror ().
@@ -480,6 +484,7 @@ typedef struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
SNDFILE* sf_open (const char *path, int mode, SF_INFO *sfinfo) ;
/* Use the existing file descriptor to create a SNDFILE object. If close_desc
** is TRUE, the file descriptor will be closed when sf_close() is called. If
** it is FALSE, the descritor will not be closed.
@@ -496,18 +501,21 @@ SNDFILE* sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
SNDFILE* sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
/* sf_error () returns a error number which can be translated to a text
** string using sf_error_number().
*/
int sf_error (SNDFILE *sndfile) ;
/* sf_strerror () returns to the caller a pointer to the current error message for
** the given SNDFILE.
*/
const char* sf_strerror (SNDFILE *sndfile) ;
/* sf_error_number () allows the retrieval of the error string for each internal
** error number.
**
@@ -515,6 +523,7 @@ const char* sf_strerror (SNDFILE *sndfile) ;
const char* sf_error_number (int errnum) ;
/* The following two error functions are deprecated but they will remain in the
** library for the forseeable future. The function sf_strerror() should be used
** in their place.
@@ -528,10 +537,12 @@ int sf_error_str (SNDFILE *sndfile, char* str, size_t len) ;
int sf_command (SNDFILE *sndfile, int command, void *data, int datasize) ;
/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
int sf_format_check (const SF_INFO *info) ;
/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
** stdio.h function fseek ().
@@ -546,6 +557,7 @@ int sf_format_check (const SF_INFO *info) ;
sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ;
/* Functions for retrieving and setting string data within sound files.
** Not all file types support this features; AIFF and WAV do. For both
** functions, the str_type parameter must be one of the SF_STR_* values
@@ -558,12 +570,19 @@ int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
/* Return the library version string. */
const char * sf_version_string (void) ;
/* Functions for reading/writing the waveform data of a sound file.
*/
sf_count_t sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
sf_count_t sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
/* Functions for reading and writing the data chunk in terms of frames.
** The number of items actually read/written = frames * number of channels.
** sf_xxxx_raw read/writes the raw data bytes from/to the file
@@ -586,6 +605,7 @@ sf_count_t sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frame
sf_count_t sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
sf_count_t sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
/* Functions for reading and writing the data chunk in terms of items.
** Otherwise similar to above.
** All of these read/write function return number of items read/written.
@@ -603,6 +623,7 @@ sf_count_t sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t items)
sf_count_t sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t items) ;
sf_count_t sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
/* Close the SNDFILE and clean up all memory allocations associated with this
** file.
** Returns 0 on success, or an error number.
@@ -610,6 +631,7 @@ sf_count_t sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t item
int sf_close (SNDFILE *sndfile) ;
/* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
** to force the writing of data to disk. If the file is opened SFM_READ
** no action is taken.
@@ -617,8 +639,28 @@ int sf_close (SNDFILE *sndfile) ;
void sf_write_sync (SNDFILE *sndfile) ;
/* The function sf_wchar_open() is Windows Only!
** Open a file passing in a Windows Unicode filename. Otherwise, this is
** the same as sf_open().
**
** In order for this to work, you need to do the following:
**
** #include <windows.h>
** #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
** #including <sndfile.h>
*/
#if ENABLE_SNDFILE_WINDOWS_PROTOTYPES
SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
#endif /* SNDFILE_H */

1
win/Projects/libsndfile/sys/time.h Normal file
View File

@@ -0,0 +1 @@
/* dummy file to satisfy include without having to patch libsndfile */