summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Win32/Makefile.msvc6
-rw-r--r--Win32/config.h9
-rw-r--r--Win32/sndfile.h22
-rw-r--r--regtest/database.c16
-rw-r--r--regtest/sndfile-regtest.c14
5 files changed, 52 insertions, 15 deletions
diff --git a/Win32/Makefile.msvc b/Win32/Makefile.msvc
index 481ef42..ef9451a 100644
--- a/Win32/Makefile.msvc
+++ b/Win32/Makefile.msvc
@@ -93,7 +93,8 @@ LINK32_OBJS= \
".\src\ogg.obj" \
".\src\pvf.obj" \
".\src\xi.obj" \
- ".\src\htk.obj"
+ ".\src\htk.obj" \
+ ".\src\flac.obj"
libsndfile.dll : $(LINK32_OBJS) ".\src\libsndfile.def"
$(LINK32) $(DLL_LINK_FLAGS) /def:".\src\libsndfile.def" $(LINK32_OBJS)
@@ -455,6 +456,9 @@ CHECK: $(TEST_PROGS)
".\src\htk.obj" : ".\src\htk.c"
$(CPP) $(CFLAGS) /Fo".\src\htk.obj" /c ".\src\htk.c"
+".\src\flac.obj" : ".\src\flac.c"
+ $(CPP) $(CFLAGS) /Fo".\src\flac.obj" /c ".\src\flac.c"
+
#====================================================================
# Object files for test programs.
diff --git a/Win32/config.h b/Win32/config.h
index a152b59..1ae046a 100644
--- a/Win32/config.h
+++ b/Win32/config.h
@@ -141,6 +141,9 @@
/* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1
+/* Set to 1 if you have libsqlite3. */
+/* #undef HAVE_SQLITE3 */
+
/* Define to 1 if the system has the type `ssize_t'. */
/* #undef HAVE_SSIZE_T */
@@ -190,13 +193,13 @@
#define PACKAGE_NAME "libsndfile"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libsndfile 1.0.11"
+#define PACKAGE_STRING "libsndfile 1.0.12pre9"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libsndfile"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.11pre11"
+#define PACKAGE_VERSION "1.0.12pre9"
/* Set to maximum allowed value of sf_count_t type. */
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFi64
@@ -250,7 +253,7 @@
#define TYPEOF_SF_COUNT_T __int64_t
/* Version number of package */
-#define VERSION "1.0.11"
+#define VERSION "1.0.12pre9"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
diff --git a/Win32/sndfile.h b/Win32/sndfile.h
index 9120cfa..f401ddc 100644
--- a/Win32/sndfile.h
+++ b/Win32/sndfile.h
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 1999-2005 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
@@ -71,6 +71,7 @@ enum
SF_FORMAT_AVR = 0x120000, /* Audio Visual Research */
SF_FORMAT_WAVEX = 0x130000, /* MS WAVE with WAVEFORMATEX */
SF_FORMAT_SD2 = 0x160000, /* Sound Designer 2 */
+ SF_FORMAT_FLAC = 0x170000, /* FLAC lossless file format */
/* Subtypes from here on. */
@@ -104,7 +105,6 @@ enum
SF_FORMAT_DPCM_8 = 0x0050, /* 8 bit differential PCM (XI only) */
SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */
-
/* Endian-ness options. */
SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */
@@ -436,7 +436,7 @@ const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
*/
sf_count_t sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
-sf_count_t sf_write_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.
@@ -449,16 +449,16 @@ sf_count_t sf_write_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
*/
sf_count_t sf_readf_short (SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
-sf_count_t sf_writef_short (SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
+sf_count_t sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) ;
sf_count_t sf_readf_int (SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
-sf_count_t sf_writef_int (SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
+sf_count_t sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) ;
sf_count_t sf_readf_float (SNDFILE *sndfile, float *ptr, sf_count_t frames) ;
-sf_count_t sf_writef_float (SNDFILE *sndfile, float *ptr, sf_count_t frames) ;
+sf_count_t sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) ;
sf_count_t sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
-sf_count_t sf_writef_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.
@@ -466,16 +466,16 @@ sf_count_t sf_writef_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
*/
sf_count_t sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t items) ;
-sf_count_t sf_write_short (SNDFILE *sndfile, short *ptr, sf_count_t items) ;
+sf_count_t sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t items) ;
sf_count_t sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t items) ;
-sf_count_t sf_write_int (SNDFILE *sndfile, int *ptr, sf_count_t items) ;
+sf_count_t sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t items) ;
sf_count_t sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t items) ;
-sf_count_t sf_write_float (SNDFILE *sndfile, float *ptr, sf_count_t items) ;
+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, 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.
diff --git a/regtest/database.c b/regtest/database.c
index 71ccbbc..f08f72c 100644
--- a/regtest/database.c
+++ b/regtest/database.c
@@ -16,6 +16,7 @@
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
@@ -29,6 +30,8 @@
#include "regtest.h"
+#ifdef HAVE_SQLITE3
+
typedef struct
{ sqlite3 *sql ;
@@ -473,6 +476,19 @@ callback (void *unused, int argc, char **argv, char **colname)
return 0 ;
} /* callback */
+#else
+
+int
+dummy (void)
+{ /*
+ ** Empty dummy fnction so tha compiler doesn't winge about an
+ ** empty file.
+ */
+ return 0 ;
+} /* dummy */
+
+#endif
+
/*
** Do not edit or modify anything in this comment block.
diff --git a/regtest/sndfile-regtest.c b/regtest/sndfile-regtest.c
index 65aa076..0400d31 100644
--- a/regtest/sndfile-regtest.c
+++ b/regtest/sndfile-regtest.c
@@ -16,12 +16,16 @@
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sndfile.h>
+#ifdef HAVE_SQLITE3
+
#include "regtest.h"
enum
@@ -103,7 +107,17 @@ print_libsndfile_version (void)
printf ("\nsndfile-regtest : using %s\n\n", version) ;
} /* print_lib_version */
+#else
+
+int
+main (void)
+{
+ puts ("\nThis program was not compiled with libsqlite3 and hence doesn't work.\n") ;
+
+ return 0 ;
+} /* main */
+#endif
/*
** Do not edit or modify anything in this comment block.
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-20 03:31:44 +0000